diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2012-11-24 22:47:26 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2012-11-24 22:47:26 -0500 |
| commit | 80a210e263d8787b9bc87fffc7090b3769f8cb5b (patch) | |
| tree | ef5e8569824955cb8f6d93550eaee3217f9871ff /setuptools/dist.py | |
| parent | 61568ea992268605a85d39edde0c179fe3850e9e (diff) | |
| parent | dbbfab8fe8a8c146c2353f751d617c8761f6ddc4 (diff) | |
| download | external_python_setuptools-80a210e263d8787b9bc87fffc7090b3769f8cb5b.tar.gz external_python_setuptools-80a210e263d8787b9bc87fffc7090b3769f8cb5b.tar.bz2 external_python_setuptools-80a210e263d8787b9bc87fffc7090b3769f8cb5b.zip | |
Merge
--HG--
branch : distribute
extra : rebase_source : c0f43d4688762927683ef5f0d4a3e879190dae72
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 998a4dbe..6236d5be 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -242,9 +242,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) |