Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1307305 - Don't use --trusted-host with easy_install; r=ted

Browse Source 
3fd83c9c0548 introduced the use of --trusted-host for use with pip.
Unfortunately, it unconditionally added --trusted-host, even when
easy_install is being used. This broke modules using easy_install
(which is currently limited to pywin32). Removing easy_install
and installing pywin32 is tracked in bug 1306691.

MozReview-Commit-ID: ExiO22EUr0B

--HG--
extra : rebase_source : 25dcded06a47ec8c0e61637bdd425131fe20a543
This commit is contained in:
Gregory Szorc 2016-10-03 17:10:52 -07:00
parent cd91c69ac8
commit 2dda282bea
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testing/mozharness/mozharness/base/python.py
View File

@ -280,7 +280,8 @@ class VirtualenvMixin(object):
if parsed.scheme != 'https':
trusted_hosts.add(parsed.hostname)
if self.pip_version >= distutils.version.LooseVersion('6.0'):
if (install_method != 'easy_install' and
self.pip_version >= distutils.version.LooseVersion('6.0')):
for host in sorted(trusted_hosts):
command.extend(['--trusted-host', host])