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

[arch] fix: not detecting conflicts (regression)

Browse Source
This commit is contained in:
Vinicius Moreira
2022-03-02 15:38:41 -03:00
parent 8c32bfec09
commit 5594a5898a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2315,7 +2315,7 @@ class ArchManager(SoftwareManager):
self.logger.info("Checking for possible conflicts with '{}'".format(context.name)) self.logger.info("Checking for possible conflicts with '{}'".format(context.name))
_, output = context.handler.handle_simple(pacman.install_as_process(pkgpaths=pkgpaths, _, output = context.handler.handle_simple(pacman.install_as_process(pkgpaths=pkgpaths,
root_password=None, root_password=context.root_password,
pkgdir=context.project_dir or '.', pkgdir=context.project_dir or '.',
file=bool(context.install_files), file=bool(context.install_files),
simulate=True), simulate=True),

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

@@ -151,7 +151,9 @@ def install_as_process(pkgpaths: Iterable[str], root_password: Optional[str], fi
cmd = ['pacman', '-U'] if file else ['pacman', '-S'] cmd = ['pacman', '-U'] if file else ['pacman', '-S']
cmd.extend(pkgpaths) cmd.extend(pkgpaths)
if not simulate: if simulate:
cmd.append('--confirm')
else:
cmd.append('--noconfirm') cmd.append('--noconfirm')
cmd.append('-dd') cmd.append('-dd')
@@ -162,7 +164,7 @@ def install_as_process(pkgpaths: Iterable[str], root_password: Optional[str], fi
cmd.append('--asdeps') cmd.append('--asdeps')
return SimpleProcess(cmd=cmd, return SimpleProcess(cmd=cmd,
root_password=None if simulate else root_password, root_password=root_password,
cwd=pkgdir, cwd=pkgdir,
error_phrases={"error: failed to prepare transaction", 'error: failed to commit transaction', 'error: target not found'}, error_phrases={"error: failed to prepare transaction", 'error: failed to commit transaction', 'error: target not found'},
shell=True) shell=True)