zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-01 20:31:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

set PYTHONPATH properly for isolated usage of runner

Browse Source
This commit is contained in:
Ryan Petrello
2019-03-28 10:43:14 -04:00
parent 99478f5d25
commit dd81f59d9a
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/tasks.py
View File

@@ -4,7 +4,6 @@
# Python
from collections import OrderedDict, namedtuple
import errno
import fnmatch
import functools
import importlib
import json
@@ -870,12 +869,8 @@ class BaseTask(object):
raise RuntimeError(
'a valid Python virtualenv does not exist at {}'.format(venv_path)
)
env.pop('PYTHONPATH', None) # default to none if no python_ver matches
for version in os.listdir(venv_libdir):
if fnmatch.fnmatch(version, 'python[23].*'):
if os.path.isdir(os.path.join(venv_libdir, version)):
env['PYTHONPATH'] = os.path.join(venv_libdir, version, "site-packages") + ":"
break
isolated_manager.set_pythonpath(venv_libdir, env)
def add_awx_venv(self, env):
env['VIRTUAL_ENV'] = settings.AWX_VENV_PATH