summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xEasyInstall.txt4
-rw-r--r--pkg_resources.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt
index 327d63c..0d98e7c 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -870,6 +870,10 @@ Known Issues
* Fixed ``.pth`` file processing picking up nested eggs (i.e. ones inside
"baskets") when they weren't explicitly listed in the ``.pth`` file.
+ * If more than one URL appears to describe the exact same distribution, prefer
+ the shortest one. This helps to avoid "table of contents" CGI URLs like the
+ ones on effbot.org.
+
0.6a8
* Update for changed SourceForge mirror format
diff --git a/pkg_resources.py b/pkg_resources.py
index 4cf262b..371ef20 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1754,7 +1754,7 @@ class Distribution(object):
hashcmp = property(
lambda self: (
getattr(self,'parsed_version',()), self.precedence, self.key,
- self.location, self.py_version, self.platform
+ -len(self.location), self.location, self.py_version, self.platform
)
)
def __cmp__(self, other): return cmp(self.hashcmp, other)