summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-08-11 15:01:24 +0000
committerChris Lumens <clumens@redhat.com>2006-08-11 15:01:24 +0000
commit8ca874078b4a7d1b7da006e69a1076fd9973fe9b (patch)
tree13768abc2b01db96a35d34e8954d7aaa8e7afeac
parent3ce263801fb2da78611e41e5e2a161e03f62cbe9 (diff)
downloadanaconda-8ca874078b4a7d1b7da006e69a1076fd9973fe9b.tar.gz
anaconda-8ca874078b4a7d1b7da006e69a1076fd9973fe9b.tar.xz
anaconda-8ca874078b4a7d1b7da006e69a1076fd9973fe9b.zip
Capture stderr output too (useful for logging VNC error messages).
-rw-r--r--ChangeLog5
-rw-r--r--iutil.py3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e8354ff75..6df923633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-11 Chris Lumens <clumens@redhat.com>
+
+ * iutil.py (execWithCapture): Capture stderr output too (useful for
+ logging VNC error messages).
+
2006-08-10 David Cantrell <dcantrell@redhat.com>
* loader2/net.c: Remember user choices on network configuration
diff --git a/iutil.py b/iutil.py
index fc6f09b3a..77138c9a1 100644
--- a/iutil.py
+++ b/iutil.py
@@ -65,7 +65,8 @@ def execWithCapture(command, argv, stdin = 0, stderr = 2, root='/'):
try:
pipe = subprocess.Popen([command] + argv, stdin=stdin,
stdout=subprocess.PIPE,
- stderr=stderr, preexec_fn=chroot)
+ stderr=subprocess.STDOUT,
+ preexec_fn=chroot)
except OSError, (errno, msg):
raise RuntimeError, "Error running " + command + ": " + msg