From a9aea3c6d4d1e76ed9b9afb372e75ee55f53ede4 Mon Sep 17 00:00:00 2001 From: Lukas Pirl Date: Tue, 26 Jul 2016 16:46:16 +0200 Subject: [PATCH] (re)allow ansible_python_interpreter to contain more than 1 arg (#16247) --- lib/ansible/executor/module_common.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/ansible/executor/module_common.py b/lib/ansible/executor/module_common.py index 23954a3e91..9ce6eb0511 100644 --- a/lib/ansible/executor/module_common.py +++ b/lib/ansible/executor/module_common.py @@ -641,15 +641,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_ANSIBALLZ_TEMPLATE % dict( zipdata=zipdata,