diff options
| author | PJ Eby <distutils-sig@python.org> | 2006-07-21 16:58:10 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2006-07-21 16:58:10 +0000 |
| commit | 6cc3cd685e28a359bd9020ef9e6f69a0387692ec (patch) | |
| tree | e9ff6e9340d30e9404b743f14f39fd82d9a7aad7 | |
| parent | c816c62cf23bbc35e9fb0dee6a70ea477fe1cb47 (diff) | |
| download | python-setuptools-git-6cc3cd685e28a359bd9020ef9e6f69a0387692ec.tar.gz | |
Fix a problem with eggs specified directly on ``PYTHONPATH`` on
case-insensitive filesystems possibly not showing up in the default
working set, due to differing normalizations of ``sys.path`` entries.
(backport from trunk)
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4050757
| -rw-r--r-- | pkg_resources.py | 6 | ||||
| -rwxr-xr-x | pkg_resources.txt | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 5cb4e2ce..7e89d69e 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -438,17 +438,17 @@ class WorkingSet(object): if entry is None: entry = dist.location keys = self.entry_keys.setdefault(entry,[]) - + keys2 = self.entry_keys.setdefault(dist.location,[]) if dist.key in self.by_key: return # ignore hidden distros self.by_key[dist.key] = dist if dist.key not in keys: keys.append(dist.key) - + if dist.key not in keys2: + keys2.append(dist.key) self._added_new(dist) - def resolve(self, requirements, env=None, installer=None): """List all distributions needed to (recursively) meet `requirements` diff --git a/pkg_resources.txt b/pkg_resources.txt index a502411c..bcd0925a 100755 --- a/pkg_resources.txt +++ b/pkg_resources.txt @@ -1687,6 +1687,11 @@ File/Path Utilities Release Notes/Change History ---------------------------- +0.6c2 + * Fix a problem with eggs specified directly on ``PYTHONPATH`` on + case-insensitive filesystems possibly not showing up in the default + working set, due to differing normalizations of ``sys.path`` entries. + 0.6b3 * Fixed a duplicate path insertion problem on case-insensitive filesystems. |