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

marked the two spots where a setuptools < 0.7 check needs to happen

--HG--
branch : distribute
extra : rebase_source : 1bca77205a947da3227c069e237951258fc72ffb
parent 774fb7a0
......@@ -505,6 +505,7 @@ class WorkingSet(object):
while requirements:
req = requirements.pop(0) # process dependencies breadth-first
if req.project_name == 'setuptools':
# TODO: only return distribute if setuptools < 0.7
req = Requirement.parse('distribute')
if req in processed:
......@@ -2497,6 +2498,7 @@ class Requirement:
# and if distribute is installed, we want to give
# distribute instead
if founded_req.project_name == 'setuptools':
# TODO: only return distribute if setuptools < 0.7
distribute = list(parse_requirements('distribute'))
if len(distribute) == 1:
return distribute[0]
......
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