Commit 8acf86a7 authored by PJ Eby's avatar PJ Eby

Actually process relative .egg-link files (backport from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4053794
parent 7a27a6f7
...@@ -1633,7 +1633,7 @@ def find_on_path(importer, path_item, only=False): ...@@ -1633,7 +1633,7 @@ def find_on_path(importer, path_item, only=False):
elif not only and lower.endswith('.egg-link'): elif not only and lower.endswith('.egg-link'):
for line in file(os.path.join(path_item, entry)): for line in file(os.path.join(path_item, entry)):
if not line.strip(): continue 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 yield item
register_finder(ImpWrapper,find_on_path) register_finder(ImpWrapper,find_on_path)
......
...@@ -1695,6 +1695,8 @@ Release Notes/Change History ...@@ -1695,6 +1695,8 @@ Release Notes/Change History
0.6c6 0.6c6
* Fix extracted C extensions not having executable permissions under Cygwin. * Fix extracted C extensions not having executable permissions under Cygwin.
* Allow ``.egg-link`` files to contain relative paths.
0.6c4 0.6c4
* Fix "dev" versions being considered newer than release candidates. * Fix "dev" versions being considered newer than release candidates.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment