diff options
| author | Erik Bray <embray@stsci.edu> | 2012-09-11 13:53:29 -0400 |
|---|---|---|
| committer | Erik Bray <embray@stsci.edu> | 2012-09-11 13:53:29 -0400 |
| commit | dbbfab8fe8a8c146c2353f751d617c8761f6ddc4 (patch) | |
| tree | b6c0a99cdd01f7ad2f6e4cbd102ff12e27ef3386 /setuptools/dist.py | |
| parent | cada83b25777a9b089b85bc4417baa7016a9c652 (diff) | |
| download | external_python_setuptools-dbbfab8fe8a8c146c2353f751d617c8761f6ddc4.tar.gz external_python_setuptools-dbbfab8fe8a8c146c2353f751d617c8761f6ddc4.tar.bz2 external_python_setuptools-dbbfab8fe8a8c146c2353f751d617c8761f6ddc4.zip | |
Fixes and adds a regression test for #323; required adding some new keyword arguments to existing pkg_resources methods. Also had to update how __path__ is handled for namespace packages to ensure that when a new egg distribution containing a namespace package is placed on sys.path, the entries in __path__ are in the same order they would have been in had that egg been on the path when pkg_resources was first imported
--HG--
branch : distribute
extra : rebase_source : 63a120c9397f6619d2768ec982e5c6b664c97e40
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 6607cf7b..2061c0a2 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) |