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

(re)allow ansible_python_interpreter to contain more than 1 arg (#16247)

Browse source
This commit is contained in:
Lukas Pirl 2016-07-26 16:46:16 +02:00 committed by Toshio Kuratomi
parent 167a12003d
commit db4e661fef
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/executor/module_common.py
View file

@ -626,15 +626,10 @@ def _find_snippet_imports(module_name, module_data, module_path, module_args, ta
if shebang is None:
shebang = u'#!/usr/bin/python'
executable = interpreter.split(u' ', 1)
if len(executable) == 2 and executable[0].endswith(u'env'):
# Handle /usr/bin/env python style interpreter settings
interpreter = u"'{0}', '{1}'".format(*executable)
else:
# Still have to enclose the parts of the interpreter in quotes
# because we're substituting it into the template as a python
# string
interpreter = u"'{0}'".format(interpreter)
# Enclose the parts of the interpreter in quotes because we're
# substituting it into the template as a Python string
interpreter_parts = interpreter.split(u' ')
interpreter = u"'{0}'".format(u"', '".join(interpreter_parts))
output.write(to_bytes(ACTIVE_ZIPLOADER_TEMPLATE % dict(
zipdata=zipdata,