13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
13 lines
563 B
Diff
13 lines
563 B
Diff
diff -up sos-2.2/sos/helpers.py.orig sos-2.2/sos/helpers.py
|
|
--- sos-2.2/sos/helpers.py.orig 2011-08-14 13:15:07.018884665 +0100
|
|
+++ sos-2.2/sos/helpers.py 2011-08-14 13:15:21.880027577 +0100
|
|
@@ -55,7 +55,7 @@ def sosGetCommandOutput(command, timeout
|
|
|
|
p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE, bufsize=-1)
|
|
stdout, stderr = p.communicate()
|
|
- return (p.returncode, stdout.strip(), 0)
|
|
+ return (p.returncode, stdout, 0)
|
|
|
|
def commonPrefix(l1, l2, common = []):
|
|
''' return a list of common elements at the start of all sequences,
|