Allow to change executable (shell/interpreter) when using raw

This patch adds an optional 'executable=' option to the raw command line to override the default shell (/bin/sh), much like the shell module does.
This commit is contained in:
Dag Wieers 2012-12-23 19:17:07 +01:00
commit 846161a1a4
8 changed files with 51 additions and 24 deletions

View file

@ -17,6 +17,7 @@
import traceback
import os
import pipes
import shutil
import subprocess
from ansible import errors
@ -36,20 +37,22 @@ class Connection(object):
return self
def exec_command(self, cmd, tmp_path, sudo_user, sudoable=False):
def exec_command(self, cmd, tmp_path, sudo_user, sudoable=False, executable='/bin/sh'):
''' run a command on the local host '''
if self.runner.sudo and sudoable:
if not self.runner.sudo or not sudoable:
local_cmd = [ executable, '-c', cmd]
else:
if self.runner.sudo_pass:
# NOTE: if someone wants to add sudo w/ password to the local connection type, they are welcome
# to do so. The primary usage of the local connection is for crontab and kickstart usage however
# so this doesn't seem to be a huge priority
raise errors.AnsibleError("sudo with password is presently only supported on the 'paramiko' (SSH) and native 'ssh' connection types")
cmd = "sudo -u {0} -s {1}".format(sudo_user, cmd)
sudocmd = "sudo -u %s -s %s -c %s" % (sudo_user, executable, cmd)
local_cmd = ['/bin/sh', '-c', sudocmd]
vvv("EXEC %s" % cmd, host=self.host)
basedir = self.runner.basedir
p = subprocess.Popen(cmd, cwd=basedir, shell=True, stdin=None,
vvv("EXEC %s" % local_cmd, host=self.host)
p = subprocess.Popen(local_cmd, cwd=self.runner.basedir, executable=executable,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate()
return (p.returncode, '', stdout, stderr)