Merge pull request #741 from tima/low-level-stderr

concatenating stdout and stderr in runner/__init__'s _low_level_exec_command
pull/742/merge
Michael DeHaan 12 years ago
commit dc3e142486

@ -616,9 +616,16 @@ class Runner(object):
stdin, stdout, stderr = conn.exec_command(cmd, tmp, sudo_user, sudoable=sudoable)
if type(stdout) != str:
return "\n".join(stdout.readlines())
out = "\n".join(stdout.readlines())
else:
return stdout
out = stdout
if type(stderr) != str:
err = "\n".join(stderr.readlines())
else:
err = stderr
return out + err
# *****************************************************

Loading…
Cancel
Save