diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2012-11-26 09:20:11 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2012-11-26 09:20:11 -0500 |
| commit | ceb03af882740ae02ef4be004a30b45c7b25b9ce (patch) | |
| tree | cb576f8a6f5979aedcb3ce0a5b9585059e4f3f59 /setuptools/dist.py | |
| parent | f31fb0ff20c63dd9bb82f91af45c12e97428e38c (diff) | |
| download | external_python_setuptools-ceb03af882740ae02ef4be004a30b45c7b25b9ce.tar.gz external_python_setuptools-ceb03af882740ae02ef4be004a30b45c7b25b9ce.tar.bz2 external_python_setuptools-ceb03af882740ae02ef4be004a30b45c7b25b9ce.zip | |
Backed out changeset: 98a9f9dcce0e; Fixes #335.
--HG--
branch : distribute
extra : rebase_source : 3f4ff1c880688e6dd72d2fa8fab3c07e7f486a7e
Diffstat (limited to 'setuptools/dist.py')
| -rw-r--r-- | setuptools/dist.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index 6236d5be..998a4dbe 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -242,10 +242,9 @@ class Distribution(_Distribution): """Resolve pre-setup requirements""" from pkg_resources import working_set, parse_requirements for dist in working_set.resolve( - parse_requirements(requires), installer=self.fetch_build_egg, - replace_conflicting=True + parse_requirements(requires), installer=self.fetch_build_egg ): - working_set.add(dist, replace=True) + working_set.add(dist) def finalize_options(self): _Distribution.finalize_options(self) |