cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove an extra space in the module execution line if no environment was set.

Browse source
This commit is contained in:
Michael DeHaan 2013-04-19 08:11:17 -04:00
parent 0f86b26823
commit 8e7dc3c79c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/runner/__init__.py
View file

@ -293,6 +293,8 @@ class Runner(object):
raise errors.AnsibleError("module is missing interpreter line") raise errors.AnsibleError("module is missing interpreter line")
cmd = " ".join([environment_string, shebang.replace("#!",""), cmd]) cmd = " ".join([environment_string, shebang.replace("#!",""), cmd])
cmd = cmd.strip()
if tmp.find("tmp") != -1 and C.DEFAULT_KEEP_REMOTE_FILES != '1' and not persist_files: if tmp.find("tmp") != -1 and C.DEFAULT_KEEP_REMOTE_FILES != '1' and not persist_files:
cmd = cmd + "; rm -rf %s >/dev/null 2>&1" % tmp cmd = cmd + "; rm -rf %s >/dev/null 2>&1" % tmp
res = self._low_level_exec_command(conn, cmd, tmp, sudoable=True) res = self._low_level_exec_command(conn, cmd, tmp, sudoable=True)
@ -677,7 +679,7 @@ class Runner(object):
lines = module_data.split("\n") lines = module_data.split("\n")
shebang = None shebang = None
if lines[0].startswith("#!"): if lines[0].startswith("#!"):
shebang = lines[0] shebang = lines[0].strip()
args = shlex.split(str(shebang[2:])) args = shlex.split(str(shebang[2:]))
interpreter = args[0] interpreter = args[0]
interpreter_config = 'ansible_%s_interpreter' % os.path.basename(interpreter) interpreter_config = 'ansible_%s_interpreter' % os.path.basename(interpreter)