spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-07 00:04:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[improvement][arch] unifying the process output when upgrading several repo packages to prevent wrong error returns

Browse Source
This commit is contained in:
Vinícius Moreira
2020-04-14 16:18:39 -03:00
parent 355e7f7bf8
commit 323a5a1a76
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bauh/commons/system.py
View File

@@ -157,18 +157,22 @@ class ProcessHandler:
return process.subproc.returncode is None or process.subproc.returncode == 0
def handle_simple(self, proc: SimpleProcess) -> Tuple[bool, str]:
def handle_simple(self, proc: SimpleProcess, output_handler=None) -> Tuple[bool, str]:
self._notify_watcher(' '.join(proc.instance.args) + '\n')
output = StringIO()
for o in proc.instance.stdout:
if o:
line = o.decode()
output.write(line)
line = line.strip()
if line:
if output_handler:
output_handler(line)
self._notify_watcher(line)
output.seek(0)

4
bauh/gems/arch/controller.py
View File

@@ -728,7 +728,7 @@ class ArchManager(SoftwareManager):
try:
output_handler = TransactionStatusHandler(watcher, self.i18n, len(repo_pkgs_names), self.logger)
output_handler.start()
success = handler.handle(pacman.upgrade_several(repo_pkgs_names, root_password), output_handler=output_handler.handle)
success = handler.handle_simple(pacman.upgrade_several(repo_pkgs_names, root_password), output_handler=output_handler.handle)
output_handler.stop_working()
output_handler.join()
@@ -741,7 +741,7 @@ class ArchManager(SoftwareManager):
disk.save_several(repo_pkgs_names, repo_map=repo_map, overwrite=True, maintainer=None)
else:
self.logger.error("An error occurred while upgrading repository packages")
self.logger.error("'pacman' returned an unexpected response after upgrading the repository packages")
return False
except:
watcher.change_substatus('')

8
bauh/gems/arch/pacman.py
View File

@@ -691,12 +691,8 @@ def list_installed_names() -> Set[str]:
return {p for p in run_cmd('pacman -Qq').split('\n') if p}
def upgrade_several(pkgnames: Iterable[str], root_password: str) -> SystemProcess:
cmd = ['pacman', '-S', *pkgnames, '--noconfirm']
if root_password:
return SystemProcess(new_root_subprocess(cmd, root_password), wrong_error_phrase='warning:')
else:
return SystemProcess(new_subprocess(cmd), wrong_error_phrase='warning:')
def upgrade_several(pkgnames: Iterable[str], root_password: str) -> SimpleProcess:
return SimpleProcess(cmd=['pacman', '-S', *pkgnames, '--noconfirm'], root_password=root_password)
def remove_several(pkgnames: Iterable[str], root_password: str) -> SystemProcess:

2
bauh/view/qt/prepare.py
View File

@@ -236,7 +236,7 @@ class PreparePanel(QWidget, TaskManager):
lb_icon.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
if icon_path:
lb_icon.setPixmap(QIcon(icon_path).pixmap(12, 12))
lb_icon.setPixmap(QIcon(icon_path).pixmap(14, 14))
self.table.setCellWidget(task_row, 0, lb_icon)

3
bauh/view/qt/root.py
View File

@@ -9,6 +9,7 @@ from bauh.commons.system import new_subprocess
from bauh.view.core.config import read_config
from bauh.view.qt.dialog import show_message
from bauh.view.qt.view_utils import load_resource_icon
from bauh.view.util import util
from bauh.view.util.translation import I18n
@@ -28,7 +29,7 @@ def ask_root_password(context: ApplicationContext, i18n: I18n, app_config: dict
diag.setStyleSheet("""QLineEdit { border-radius: 5px; font-size: 16px; border: 1px solid lightblue }""")
diag.setInputMode(QInputDialog.TextInput)
diag.setTextEchoMode(QLineEdit.Password)
diag.setWindowIcon(load_resource_icon('img/lock.svg', 20, 24))
diag.setWindowIcon(util.get_default_icon()[1])
diag.setWindowTitle(i18n['popup.root.title'])
diag.setLabelText('')
diag.setOkButtonText(i18n['popup.root.continue'].capitalize())