Blob Blame History Raw
commit 25bd83cda4ef1a5c89d95282c9f8fdc6cb9181d5
Author: Bryn M. Reeves <bmr@redhat.com>
Date:   Tue Oct 15 17:26:12 2013 +0100

    Remove obsolete workaround for newline added by pipe.communicate()
    
    Older versions of the python runtime would add a newline to output
    obtained via pipe.communicate(). Current versions do not leading
    to output being stored in reports without a trailing newline
    character.
    
    Remove the workaround to ensure that stored content matches that
    obtained via simple shell redirection ("/some/command > file").
    
    Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

diff --git a/sos/utilities.py b/sos/utilities.py
index 4279b12..fcc78c5 100644
--- a/sos/utilities.py
+++ b/sos/utilities.py
@@ -161,8 +161,6 @@ def sos_get_command_output(command, timeout=300):
                 stdout=PIPE, stderr=STDOUT,
                 bufsize=-1, env = cmd_env)
         stdout, stderr = p.communicate()
-        # hack to delete trailing '\n' added by p.communicate()
-        if stdout[-1:] == '\n': stdout = stdout[:-1]
         return (p.returncode, stdout, 0)
     else:
         return (127, "", 0)