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

fix: conflict output in stderr

Browse Source
This commit is contained in:
Vinicius Moreira
2019-09-23 17:33:25 -03:00
parent dae63f3f24
commit 75577f0b94
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
bauh/commons/system.py
View File

@@ -58,15 +58,34 @@ class SystemProcess:
class SimpleProcess:
def __init__(self, cmd: List[str], cwd: str = '.', expected_code: int = None, global_interpreter: bool = USE_GLOBAL_INTERPRETER, lang: str = DEFAULT_LANG):
self.instance = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
bufsize=-1,
cwd=cwd,
env=gen_env(global_interpreter, lang))
def __init__(self, cmd: List[str], cwd: str = '.', expected_code: int = None, global_interpreter: bool = USE_GLOBAL_INTERPRETER,
lang: str = DEFAULT_LANG, root_password: str = None):
pwdin, final_cmd = None, []
if root_password is not None:
final_cmd.extend(['sudo', '-S'])
pwdin = self._new(['echo', root_password], cwd, global_interpreter, lang).stdout
final_cmd.extend(cmd)
self.instance = self._new(final_cmd, cwd, global_interpreter, lang, stdin=pwdin)
self.expected_code = expected_code
def _new(self, cmd: List[str], cwd: str, global_interpreter: bool, lang: str, stdin = None) -> subprocess.Popen:
args = {
"stdout": subprocess.PIPE,
"stderr": subprocess.STDOUT,
"bufsize": -1,
"cwd": cwd,
"env": gen_env(global_interpreter, lang)
}
if stdin:
args['stdin'] = stdin
return subprocess.Popen(cmd, **args)
class ProcessHandler:

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

@@ -501,9 +501,8 @@ class ArchManager(SoftwareManager):
handler.watcher.change_substatus(self.i18n['arch.checking.conflicts'].format(bold(pkgname)))
for check_out in new_root_subprocess(['pacman', '-U', pkgpath], root_password=root_password, cwd=pkgdir).stdout:
if check_out:
check_install_output.append(check_out.decode())
for check_out in SimpleProcess(['pacman', '-U', pkgpath], root_password=root_password, cwd=pkgdir).instance.stdout:
check_install_output.append(check_out.decode())
self._update_progress(handler.watcher, 70, change_progress)
if check_install_output and 'conflict' in check_install_output[-1]: