External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 00:38:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #788 from wenottingham/no-country-for-old-python

Browse Source 
Don't bother checking for python 2.6 in the venv
This commit is contained in:
Bill Nottingham
2017-12-11 14:57:25 -05:00
committed by GitHub
parent 1be3c77ac6 c62430c282
commit 9be438a60a
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/management/commands/inventory_import.py
View File

@@ -85,10 +85,8 @@ class AnsibleInventoryLoader(object):
env['ANSIBLE_INVENTORY_UNPARSED_FAILED'] = '1' env['ANSIBLE_INVENTORY_UNPARSED_FAILED'] = '1'
venv_libdir = os.path.join(settings.ANSIBLE_VENV_PATH, "lib") venv_libdir = os.path.join(settings.ANSIBLE_VENV_PATH, "lib")
env.pop('PYTHONPATH', None) # default to none if no python_ver matches env.pop('PYTHONPATH', None) # default to none if no python_ver matches
for python_ver in ["python2.7", "python2.6"]: if os.path.isdir(os.path.join(venv_libdir, "python2.7")):
if os.path.isdir(os.path.join(venv_libdir, python_ver)): env['PYTHONPATH'] = os.path.join(venv_libdir, "python2.7", "site-packages") + ":"
env['PYTHONPATH'] = os.path.join(venv_libdir, python_ver, "site-packages") + ":"
break
return env return env
def get_base_args(self): def get_base_args(self):

6
awx/main/tasks.py
View File

@@ -622,10 +622,8 @@ class BaseTask(LogErrorsTask):
env['PATH'] = os.path.join(settings.ANSIBLE_VENV_PATH, "bin") + ":" + env['PATH'] env['PATH'] = os.path.join(settings.ANSIBLE_VENV_PATH, "bin") + ":" + env['PATH']
venv_libdir = os.path.join(settings.ANSIBLE_VENV_PATH, "lib") venv_libdir = os.path.join(settings.ANSIBLE_VENV_PATH, "lib")
env.pop('PYTHONPATH', None) # default to none if no python_ver matches env.pop('PYTHONPATH', None) # default to none if no python_ver matches
for python_ver in ["python2.7", "python2.6"]: if os.path.isdir(os.path.join(venv_libdir, "python2.7")):
if os.path.isdir(os.path.join(venv_libdir, python_ver)): env['PYTHONPATH'] = os.path.join(venv_libdir, "python2.7", "site-packages") + ":"
env['PYTHONPATH'] = os.path.join(venv_libdir, python_ver, "site-packages") + ":"
break
# Add awx/lib to PYTHONPATH. # Add awx/lib to PYTHONPATH.
if add_awx_lib: if add_awx_lib:
env['PYTHONPATH'] = env.get('PYTHONPATH', '') + self.get_path_to('..', 'lib') + ':' env['PYTHONPATH'] = env.get('PYTHONPATH', '') + self.get_path_to('..', 'lib') + ':'