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

In some cornercases, sys.executable is empty. Work around that by choosing a sensible default path to python and emitting a warning (#16487)

Browse source 
Fixes #13585

Fix grammar of warning method
This commit is contained in:
Toshio Kuratomi 2016-06-29 08:50:22 -07:00 committed by GitHub
parent 7c690f04e2
commit c7129c4efe
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/inventory/__init__.py
View file

@ -479,7 +479,12 @@ class Inventory(object):
new_host.vars = self.get_host_vars(new_host) new_host.vars = self.get_host_vars(new_host)
new_host.set_variable("ansible_connection", "local") new_host.set_variable("ansible_connection", "local")
if "ansible_python_interpreter" not in new_host.vars: if "ansible_python_interpreter" not in new_host.vars:
new_host.set_variable("ansible_python_interpreter", sys.executable) py_interp = sys.executable
if not py_interp:
# sys.executable is not set in some cornercases. #13585
display.warning('Unable to determine python interpreter from sys.executable. Using /usr/bin/python default. You can correct this by setting ansible_python_interpreter for localhost')
py_interp = '/usr/bin/python'
new_host.set_variable("ansible_python_interpreter", py_interp)
self.get_group("ungrouped").add_host(new_host) self.get_group("ungrouped").add_host(new_host)
return new_host return new_host