opendev/bindep
Code Issues Proposed changes

Fix bindep --brief for arch linux

Browse Source 
Pacman output has changed and, as of v5.1.2, has a newline after
showing package x was not found.

Without this patch, the bindep --brief would throw an exception
because the stdout is not properly matched.

Change-Id: Ibe2ca0d426d6d8fa69b5c4ee9ccf0f6a07c862a7
This commit is contained in:
Jean-Philippe Evrard 2019-02-17 11:17:05 +01:00
parent 0bc70eee07
commit 9377cdc14d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindep/depends.py
View File

@ -530,7 +530,7 @@ class Pacman(Platform):
stderr=subprocess.STDOUT).decode(getpreferredencoding(False)) stderr=subprocess.STDOUT).decode(getpreferredencoding(False))
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
eoutput = e.output.decode(getpreferredencoding(False)) eoutput = e.output.decode(getpreferredencoding(False))
if e.returncode == 1 and eoutput.endswith('was not found'): if e.returncode == 1 and eoutput.strip().endswith('was not found'):
return None return None
raise raise
# output looks like # output looks like