Bug 1452179: [mozharness] Use `python -m easy_install` to run easy_install; r=bhearsum

Differential Revision: https://phabricator.services.mozilla.com/D964

--HG--
extra : rebase_source : efc5ad2611fb5c756be31b36d19a17ae762c808e
This commit is contained in:
Tom Prince 2018-04-17 12:03:31 -06:00
Родитель 0d7ef1c889
Коммит 2e1e0ecda7
3 изменённых файлов: 1 добавлений и 8 удалений

Просмотреть файл

@ -19,8 +19,6 @@ config = {
"virtualenv_modules": ['pywin32', 'talos', 'mozinstall'],
"exes": {
'python': PYTHON,
'easy_install': ['%s/scripts/python' % VENV_PATH,
'%s/scripts/easy_install-2.7-script.py' % VENV_PATH],
'mozinstall': ['%s/scripts/python' % VENV_PATH,
'%s/scripts/mozinstall-script.py' % VENV_PATH],
'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),

Просмотреть файл

@ -19,8 +19,6 @@ config = {
"virtualenv_modules": ['pywin32', 'talos', 'mozinstall'],
"exes": {
'python': PYTHON,
'easy_install': ['%s/scripts/python' % VENV_PATH,
'%s/scripts/easy_install-2.7-script.py' % VENV_PATH],
'mozinstall': ['%s/scripts/python' % VENV_PATH,
'%s/scripts/mozinstall-script.py' % VENV_PATH],
'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),

Просмотреть файл

@ -242,10 +242,7 @@ class VirtualenvMixin(object):
# not understood by easy_install.
self.install_module(requirements=requirements,
install_method='pip')
# Allow easy_install to be overridden by
# self.config['exes']['easy_install']
default = 'easy_install'
command = self.query_exe('easy_install', default=default, return_type="list")
command = [self.query_python_path(), '-m', 'easy_install']
else:
self.fatal("install_module() doesn't understand an install_method of %s!" % install_method)