Commit 2c165194 authored by Reinout van Rees's avatar Reinout van Rees

Merge pull request #232 from lrowe/2_2_5_use_pinned_setuptools

Run easy_install with specified setuptools_version
parents 6f3ab021 f5b593cd
......@@ -322,7 +322,9 @@ class Installer:
try:
path = setuptools_loc
args = [sys.executable, '-c', _easy_install_cmd, '-mZUNxd', tmp]
args = [sys.executable, '-c',
('import sys; sys.path[0:0] = [%r]; ' % path) +
_easy_install_cmd, '-mZUNxd', tmp]
level = logger.getEffectiveLevel()
if level > 0:
args.append('-q')
......@@ -337,9 +339,7 @@ class Installer:
sys.stdout.flush() # We want any pending output first
exit_code = subprocess.call(
list(args),
env=dict(os.environ, PYTHONPATH=path))
exit_code = subprocess.call(list(args))
dists = []
env = pkg_resources.Environment([tmp])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment