Merge stdout and stderr for non-sudo

pull/494/head
Daniel Hokka Zakrisson 14 years ago
parent 0bbea3e684
commit 92dd59f641

@ -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()

Loading…
Cancel
Save