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

[phillip.eby]

Author: phillip.eby
Date: Thu Feb 15 20:38:20 2007
New Revision: 53794

Modified:
   sandbox/branches/setuptools-0.6/pkg_resources.py
   sandbox/branches/setuptools-0.6/pkg_resources.txt
Log:
Actually process relative .egg-link files (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	Thu Feb 15 20:38:20 2007
@@ -1633,7 +1633,7 @@
                 elif not only and lower.endswith('.egg-link'):
                     for line in file(os.path.join(path_item, entry)):
                         if not line.strip(): continue
-                        for item in find_distributions(line.rstrip()):
+                        for item in find_distributions(os.path.join(path_item,line.rstrip())):
                             yield item
 
 register_finder(ImpWrapper,find_on_path)

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	Thu Feb 15 20:38:20 2007
@@ -1695,6 +1695,8 @@
 0.6c6
  * Fix extracted C extensions not having executable permissions under Cygwin.
 
+ * Allow ``.egg-link`` files to contain relative paths.
+
 0.6c4
  * Fix "dev" versions being considered newer than release candidates.