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

[fix][arch] not detecting some error states during upgrade

Browse Source
This commit is contained in:
Vinicius Moreira
2020-04-24 13:46:37 -03:00
parent 274ca2d24b
commit 0d9e6315f1
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -787,7 +787,8 @@ class ArchManager(SoftwareManager):
def _uninstall_pkgs(self, pkgs: Iterable[str], root_password: str, handler: ProcessHandler) -> bool: def _uninstall_pkgs(self, pkgs: Iterable[str], root_password: str, handler: ProcessHandler) -> bool:
all_uninstalled, _ = handler.handle_simple(SimpleProcess(cmd=['pacman', '-R', *pkgs, '--noconfirm'], all_uninstalled, _ = handler.handle_simple(SimpleProcess(cmd=['pacman', '-R', *pkgs, '--noconfirm'],
root_password=root_password, root_password=root_password,
error_phrases={'error: failed to prepare transaction'})) error_phrases={'error: failed to prepare transaction',
'error: failed to commit transaction'}))
installed = pacman.list_installed_names() installed = pacman.list_installed_names()

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

@@ -144,7 +144,7 @@ def install_as_process(pkgpaths: Iterable[str], root_password: str, file: bool,
return SimpleProcess(cmd=cmd, return SimpleProcess(cmd=cmd,
root_password=root_password, root_password=root_password,
cwd=pkgdir, cwd=pkgdir,
error_phrases={"error: failed to prepare transaction"}) error_phrases={"error: failed to prepare transaction", 'error: failed to commit transaction'})
def list_desktop_entries(pkgnames: Set[str]) -> List[str]: def list_desktop_entries(pkgnames: Set[str]) -> List[str]:
@@ -697,7 +697,7 @@ def list_installed_names() -> Set[str]:
def upgrade_several(pkgnames: Iterable[str], root_password: str) -> SimpleProcess: def upgrade_several(pkgnames: Iterable[str], root_password: str) -> SimpleProcess:
return SimpleProcess(cmd=['pacman', '-S', *pkgnames, '--noconfirm'], return SimpleProcess(cmd=['pacman', '-S', *pkgnames, '--noconfirm'],
root_password=root_password, root_password=root_password,
error_phrases={'error: failed to prepare transaction'}) error_phrases={'error: failed to prepare transaction', 'error: failed to commit transaction'})
def remove_several(pkgnames: Iterable[str], root_password: str) -> SystemProcess: def remove_several(pkgnames: Iterable[str], root_password: str) -> SystemProcess: