From: David Shea <dshea(a)redhat.com>
The "x or y" construct does not have the precedence it looks like it
has.
---
src/pylorax/executils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pylorax/executils.py b/src/pylorax/executils.py
index 4d7d611..1cdd1a3 100644
--- a/src/pylorax/executils.py
+++ b/src/pylorax/executils.py
@@ -195,7 +195,7 @@ def _run_program(argv, root='/', stdin=None, stdout=None,
env_prune=None, log_ou
program_log.debug("Return code: %d", proc.returncode)
if proc.returncode and raise_err:
- output = output_string or "" + err_string or ""
+ output = (output_string or "") + (err_string or "")
raise subprocess.CalledProcessError(proc.returncode, argv, output)
return (proc.returncode, output_string)
--
To view this commit on github, visit
https://github.com/rhinstaller/lorax/commit/f276f0f8251980a05ef1f26be4a56...