From 92dd59f64171fef4612c10cd376776b0101bcdc0 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Wed, 20 Jun 2012 20:23:11 +0200 Subject: [PATCH] Merge stdout and stderr for non-sudo --- lib/ansible/runner/connection/ssh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/runner/connection/ssh.py b/lib/ansible/runner/connection/ssh.py index 8c8693a1b7f..f2d6ffe2d22 100644 --- a/lib/ansible/runner/connection/ssh.py +++ b/lib/ansible/runner/connection/ssh.py @@ -96,7 +96,7 @@ class SSHConnection(object): else: ssh_cmd.append(cmd) p = subprocess.Popen(ssh_cmd, stdin=subprocess.PIPE, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) # We can't use p.communicate here because the ControlMaster may have stdout open as well p.stdin.close()