cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
concatenating stdout and stderr in runner/__init__'s _low_level_exec_command
This commit is contained in:
Michael DeHaan 2012-07-31 17:32:29 -07:00
commit dc3e142486
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/runner/__init__.py
View file

@ -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
# *****************************************************