From 076f1bc1691c0a6fb9f66bac5384565f05987790 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Fri, 27 Apr 2012 00:46:26 -0400
Subject: [PATCH] Revert "Revert "Unify normal and sudo remote command
 execution.  Breaks stderr/stdout handling"

This reverts commit 40f603539cad5d83fafea19bf2bf862086ff8657.
---
 lib/ansible/connection.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/ansible/connection.py b/lib/ansible/connection.py
index 44521484ce9..ac60ff3f3cc 100644
--- a/lib/ansible/connection.py
+++ b/lib/ansible/connection.py
@@ -135,9 +135,15 @@ class ParamikoConnection(object):
 
     def exec_command(self, cmd, tmp_path, sudoable=False):          # pylint: disable-msg=W0613
         ''' run a command on the remote host '''
+        bufsize = 4096                              # Could make this a Runner param if needed
+        timeout_secs = self.runner.timeout          # Reusing runner's TCP connect timeout as command progress timeout
+        chan = self.ssh.get_transport().open_session()
+        chan.settimeout(timeout_secs)
+        chan.get_pty()                              # Many sudo setups require a terminal; use in both cases for consistency
+        
         if not self.runner.sudo or not sudoable:
-            stdin, stdout, stderr = self.ssh.exec_command(cmd)
-            return (stdin, stdout, stderr)
+            quoted_command = '"$SHELL" -c ' + pipes.quote(cmd) 
+            chan.exec_command(quoted_command)
         else:
             # Rather than detect if sudo wants a password this time, -k makes 
             # sudo always ask for a password if one is required. The "--"
@@ -146,25 +152,17 @@ class ParamikoConnection(object):
             # directly doesn't work, so we shellquote it with pipes.quote() 
             # and pass the quoted string to the user's shell.
             sudocmd = 'sudo -k -- "$SHELL" -c ' + pipes.quote(cmd) 
-            bufsize = 4096                              # Could make this a Runner param if needed
-            timeout_secs = self.runner.timeout          # Reusing runner's TCP connect timeout as command progress timeout
-            chan = self.ssh.get_transport().open_session()
-            chan.settimeout(timeout_secs)
-            chan.get_pty()                              # Many sudo setups require a terminal
-            #print "exec_command: " + sudocmd
             chan.exec_command(sudocmd)
             if self.runner.sudo_pass:
                 while not chan.recv_ready():
                     time.sleep(0.25)
                 sudo_output = chan.recv(bufsize)        # Pull prompt, catch errors, eat sudo output
-                #print "exec_command: " + sudo_output
-                #print "exec_command: sending password"
                 chan.sendall(self.runner.sudo_pass + '\n')
 
-            stdin = chan.makefile('wb', bufsize) 
-            stdout = chan.makefile('rb', bufsize)
-            stderr = chan.makefile_stderr('rb', bufsize) 
-            return stdin, stdout, stderr
+        stdin = chan.makefile('wb', bufsize) 
+        stdout = chan.makefile('rb', bufsize)
+        stderr = chan.makefile_stderr('rb', bufsize) 
+        return stdin, stdout, stderr
 
     def put_file(self, in_path, out_path):
         ''' transfer a file from local to remote '''