diff options
| author | PJ Eby <distutils-sig@python.org> | 2007-09-04 03:54:22 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2007-09-04 03:54:22 +0000 |
| commit | 9dcf16a56114f901c33cab7ac8057c98411ab85e (patch) | |
| tree | eb13366e5f9338a932cd4a8bc6662a52a0f446a0 | |
| parent | 996980750968d02c921bcfd33562969e97573ed9 (diff) | |
| download | external_python_setuptools-9dcf16a56114f901c33cab7ac8057c98411ab85e.tar.gz external_python_setuptools-9dcf16a56114f901c33cab7ac8057c98411ab85e.tar.bz2 external_python_setuptools-9dcf16a56114f901c33cab7ac8057c98411ab85e.zip | |
Fix package precedence problem where single-version eggs installed in
``site-packages`` would take precedence over ``.egg`` files (or
directories) installed in ``site-packages``.
(backport from trunk)
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4057944
| -rw-r--r-- | pkg_resources.py | 4 | ||||
| -rwxr-xr-x | pkg_resources.txt | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 6396f08b..78c96094 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -2230,7 +2230,8 @@ class Distribution(object): for p, item in enumerate(npath): if item==nloc: break - elif item==bdir: + elif item==bdir and self.precedence==EGG_DIST: + # if it's an .egg, give it precedence over its directory path.insert(p, loc) npath.insert(p, nloc) break @@ -2252,7 +2253,6 @@ class Distribution(object): - def check_version_conflict(self): if self.key=='setuptools': return # ignore the inevitable setuptools self-conflicts :( diff --git a/pkg_resources.txt b/pkg_resources.txt index a80e2e11..ad660a77 100755 --- a/pkg_resources.txt +++ b/pkg_resources.txt @@ -1692,6 +1692,11 @@ File/Path Utilities Release Notes/Change History ---------------------------- +0.6c7 + * Fix package precedence problem where single-version eggs installed in + ``site-packages`` would take precedence over ``.egg`` files (or directories) + installed in ``site-packages``. + 0.6c6 * Fix extracted C extensions not having executable permissions under Cygwin. |