diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-01-27 11:02:52 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-01-27 11:02:52 -0500 |
| commit | 2c66805878d8f2b46241d8944e8b5af20eeeb9e1 (patch) | |
| tree | a032cd7fb473c5c163e3920162bdfd6e4facc93a /setuptools/dist.py | |
| parent | f547377479ff30d39a121b3ba1b753dcaf544eb2 (diff) | |
| download | external_python_setuptools-2c66805878d8f2b46241d8944e8b5af20eeeb9e1.tar.gz external_python_setuptools-2c66805878d8f2b46241d8944e8b5af20eeeb9e1.tar.bz2 external_python_setuptools-2c66805878d8f2b46241d8944e8b5af20eeeb9e1.zip | |
Backed out changeset: ef949e6e6de1, which was itself a backout of the fix for Distribute #323, so this backout restores that fix and also Fixes #141.
Diffstat (limited to 'setuptools/dist.py')
| -rw-r--r-- | setuptools/dist.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index 3126cb96..0801ae74 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -260,9 +260,10 @@ 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 + parse_requirements(requires), installer=self.fetch_build_egg, + replace_conflicting=True ): - working_set.add(dist) + working_set.add(dist, replace=True) def finalize_options(self): _Distribution.finalize_options(self) |