aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkg_resources.py2
-rwxr-xr-xpkg_resources.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index 13a4eee0..4cf81d7b 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1633,7 +1633,7 @@ def find_on_path(importer, path_item, only=False):
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)
diff --git a/pkg_resources.txt b/pkg_resources.txt
index 6bde6342..a38c5f3f 100755
--- a/pkg_resources.txt
+++ b/pkg_resources.txt
@@ -1695,6 +1695,8 @@ Release Notes/Change History
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.