Changeset 3029 for trunk/packages/invirt-base/python/invirt

Timestamp:

Jul 6, 2010, 12:09:08 AM (14 years ago)

Author:

gdb

Message:

Improvements to captureOutput

File:

• trunk/packages/invirt-base/python/invirt/common.py (modified) (1 diff)

trunk/packages/invirt-base/python/invirt/common.py

@@ -83 +83 @@
         kwargs['stdout'] = subprocess.PIPE
     if 'stderr' not in kwargs:
-        kwargs['stderr'] = subprocess.STDOUT
+        kwargs['stderr'] = subprocess.PIPE
     p = subprocess.Popen(popen_args, *args, **kwargs)
-    out, _ = p.communicate(stdin_str)
+    out, err = p.communicate(stdin_str)
     if p.returncode:
-        raise subprocess.CalledProcessError(p.returncode, popen_args, out)
+        raise subprocess.CalledProcessError(p.returncode, '%s, stdout: %s, stderr: %s' %
+                                            (popen_args, out, err))
     return out