[Python-checkins] r76123 - in sandbox/branches/setuptools-0.6: EasyInstall.txt setuptools/package_index.py

[phillip.eby]

Author: phillip.eby
Date: Thu Nov  5 17:00:25 2009
New Revision: 76123

Log:
Backport to 0.6


Modified:
   sandbox/branches/setuptools-0.6/EasyInstall.txt
   sandbox/branches/setuptools-0.6/setuptools/package_index.py

Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Thu Nov  5 17:00:25 2009
@@ -1221,6 +1221,9 @@
  * Fixed AttributeError under Python 2.3 when processing "HTTP authentication"
    URLs (i.e., ones with a ``user:password at host``).
 
+ * Fixed bogus AttributeError when no local or downloadable packages are
+   available
+
 0.6c11
  * Fix installed script .exe files not working with 64-bit Python on Windows
    (wasn't actually released in 0.6c10 due to a lost checkin)

Modified: sandbox/branches/setuptools-0.6/setuptools/package_index.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/package_index.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/package_index.py	Thu Nov  5 17:00:25 2009
@@ -471,8 +471,9 @@
                 (source and "a source distribution of " or ""),
                 requirement,
             )
-        self.info("Best match: %s", dist)
-        return dist.clone(location=self.download(dist.location, tmpdir))
+        else:
+            self.info("Best match: %s", dist)
+            return dist.clone(location=self.download(dist.location, tmpdir))
 
 
     def fetch(self, requirement, tmpdir, force_scan=False, source=False):
@@ -489,7 +490,6 @@
         return None
 
 
-
     def gen_setup(self, filename, fragment, tmpdir):
         match = EGG_FRAGMENT.match(fragment)
         dists = match and [d for d in