From 78d269d0383bddfe7b1ef90a2c20c7565d687fab Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Thu, 31 May 2012 21:44:30 -0400
Subject: [PATCH] Fix for older version of sudo + some changes to imports so
 tests are happy

---
 lib/ansible/runner/__init__.py                | 4 ++--
 lib/ansible/runner/connection/__init__.py     | 4 ++--
 lib/ansible/runner/connection/paramiko_ssh.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py
index 0be80a07a2c..40bf0788425 100644
--- a/lib/ansible/runner/__init__.py
+++ b/lib/ansible/runner/__init__.py
@@ -32,11 +32,11 @@ import getpass
 import codecs
 
 import ansible.constants as C 
-import connection 
 import ansible.inventory
 from ansible import utils
 from ansible import errors
-from ansible.runner import poller
+import poller
+import connection
 from ansible import callbacks as ans_callbacks
     
 HAS_ATFORK=True
diff --git a/lib/ansible/runner/connection/__init__.py b/lib/ansible/runner/connection/__init__.py
index da242a22fb3..fb88c322e18 100644
--- a/lib/ansible/runner/connection/__init__.py
+++ b/lib/ansible/runner/connection/__init__.py
@@ -29,8 +29,8 @@ import pipes
 import socket
 import random
 
-from ansible.runner.connection import local
-from ansible.runner.connection import paramiko_ssh
+import local
+import paramiko_ssh
 
 class Connection(object):
     ''' Handles abstract connections to remote hosts '''
diff --git a/lib/ansible/runner/connection/paramiko_ssh.py b/lib/ansible/runner/connection/paramiko_ssh.py
index af3ea88a737..fb58b42ae47 100644
--- a/lib/ansible/runner/connection/paramiko_ssh.py
+++ b/lib/ansible/runner/connection/paramiko_ssh.py
@@ -99,8 +99,8 @@ class ParamikoConnection(object):
             # the -p option.
             randbits = ''.join(chr(random.randint(ord('a'), ord('z'))) for x in xrange(32))
             prompt = '[sudo via ansible, key=%s] password: ' % randbits
-            sudocmd = 'sudo -k -p "%s" -u %s -- "$SHELL" -c %s' % (prompt,
-                    sudo_user, pipes.quote(cmd))
+            sudocmd = 'sudo -k && sudo -p "%s" -u %s -- "$SHELL" -c %s' % (
+                prompt, sudo_user, pipes.quote(cmd))
             sudo_output = ''
             try:
                 chan.exec_command(sudocmd)