diff options
| author | PJ Eby <distutils-sig@python.org> | 2007-02-15 19:38:20 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2007-02-15 19:38:20 +0000 |
| commit | 8acf86a7ba74247eb0b2533ac514062a2be5f5e8 (patch) | |
| tree | 26e92aeb7abb192d46ba922628c621cc550ece6d | |
| parent | 7a27a6f7256169366cc968f75d6854754b29585d (diff) | |
| download | external_python_setuptools-8acf86a7ba74247eb0b2533ac514062a2be5f5e8.tar.gz external_python_setuptools-8acf86a7ba74247eb0b2533ac514062a2be5f5e8.tar.bz2 external_python_setuptools-8acf86a7ba74247eb0b2533ac514062a2be5f5e8.zip | |
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
| -rw-r--r-- | pkg_resources.py | 2 | ||||
| -rwxr-xr-x | pkg_resources.txt | 2 |
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. |