[Python-checkins] r57944 - sandbox/branches/setuptools-0.6/pkg_resources.py sandbox/branches/setuptools-0.6/pkg_resources.txt

[phillip.eby]

Author: phillip.eby
Date: Tue Sep  4 05:54:22 2007
New Revision: 57944

Modified:
   sandbox/branches/setuptools-0.6/pkg_resources.py
   sandbox/branches/setuptools-0.6/pkg_resources.txt
Log:
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)


Modified: sandbox/branches/setuptools-0.6/pkg_resources.py
==============================================================================
--- sandbox/branches/setuptools-0.6/pkg_resources.py	(original)
+++ sandbox/branches/setuptools-0.6/pkg_resources.py	Tue Sep  4 05:54:22 2007
@@ -2230,7 +2230,8 @@
         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 @@
 
 
 
-
     def check_version_conflict(self):
         if self.key=='setuptools':
             return      # ignore the inevitable setuptools self-conflicts  :(

Modified: sandbox/branches/setuptools-0.6/pkg_resources.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/pkg_resources.txt	(original)
+++ sandbox/branches/setuptools-0.6/pkg_resources.txt	Tue Sep  4 05:54:22 2007
@@ -1692,6 +1692,11 @@
 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.