From 9ad91d7369f1113a0611c761031a982d49586715 Mon Sep 17 00:00:00 2001 From: Sundar Raman Date: Thu, 9 Aug 2012 17:54:29 -0400 Subject: [PATCH 1/2] Fix syntax to work on Python2.4 The `val if something else something-else` syntax does not work prior to 2.5 --- library/pip | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/library/pip b/library/pip index 62cfa7b5926..2e75cbb69e6 100755 --- a/library/pip +++ b/library/pip @@ -25,7 +25,11 @@ ENV = None def _get_full_name(name, version=None): - return name if version is None else name + '==' + version + if version is None: + resp = name + else: + resp = name + '==' + version + return resp def _find_pip(): From 2f754f0284cc096f030882ab8f1b3638ffa91c41 Mon Sep 17 00:00:00 2001 From: Sundar Raman Date: Thu, 9 Aug 2012 18:02:21 -0400 Subject: [PATCH 2/2] (Re #829) Fix for sudo_cmd not defined --- lib/ansible/runner/connection/paramiko_ssh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/runner/connection/paramiko_ssh.py b/lib/ansible/runner/connection/paramiko_ssh.py index 4a00a76d112..c347a684fdf 100644 --- a/lib/ansible/runner/connection/paramiko_ssh.py +++ b/lib/ansible/runner/connection/paramiko_ssh.py @@ -101,7 +101,7 @@ class ParamikoConnection(object): prompt = '[sudo via ansible, key=%s] password: ' % randbits sudocmd = 'sudo -k && sudo -p "%s" -u %s -- "$SHELL" -c %s' % ( prompt, sudo_user, pipes.quote(cmd)) - vvv("EXEC %s" % sudo_cmd, host=self.host) + vvv("EXEC %s" % sudocmd, host=self.host) sudo_output = '' try: chan.exec_command(sudocmd)