13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
22 lines
883 B
Diff
22 lines
883 B
Diff
diff -up sos-2.2/sos/helpers.py.orig sos-2.2/sos/helpers.py
|
|
--- sos-2.2/sos/helpers.py.orig 2012-03-06 13:03:15.121460956 +0000
|
|
+++ sos-2.2/sos/helpers.py 2012-03-06 13:03:16.400460986 +0000
|
|
@@ -27,7 +27,7 @@ helper functions used by sosreport and p
|
|
"""
|
|
import os, sys
|
|
import logging
|
|
-from subprocess import Popen, PIPE
|
|
+from subprocess import Popen, PIPE, STDOUT
|
|
|
|
def importPlugin(pluginname, name):
|
|
""" Import a plugin to extend capabilities of sosreport
|
|
@@ -53,7 +53,7 @@ def sosGetCommandOutput(command, timeout
|
|
# soslog.log(logging.VERBOSE, "binary '%s' does not exist or is not runnable" % cmdfile)
|
|
return (127, "", 0)
|
|
|
|
- p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE, bufsize=-1)
|
|
+ p = Popen(command, shell=True, stdout=PIPE, stderr=STDOUT, bufsize=-1)
|
|
stdout, stderr = p.communicate()
|
|
return (p.returncode, stdout, 0)
|
|
|