Merge "package-installs: fix error case for Python 2.6"

2015-05-07 17:25:54 +00:00 · 2015-05-07 17:25:54 +00:00 · cb4ce88048
commit cb4ce88048
parent 85325a41a0 655648f99b
1 changed files with 3 additions and 1 deletions
--- a/elements/package-installs/bin/package-installs-v2
+++ b/elements/package-installs/bin/package-installs-v2
@ -30,7 +30,9 @@ def process_output(cmdline):
        proc = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
        out = proc.communicate()[0]
        if proc.returncode:
-            raise subprocess.CalledProcessError(proc.returncode, cmdline, out)
+            e = subprocess.CalledProcessError(proc.returncode, cmdline)
+            e.output = out
+            raise e
        return out