summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xEasyInstall.txt3
-rwxr-xr-xsetuptools/package_index.py6
2 files changed, 6 insertions, 3 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt
index 6dad8c41..df11309a 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1221,6 +1221,9 @@ Release Notes/Change History
* Fixed AttributeError under Python 2.3 when processing "HTTP authentication"
URLs (i.e., ones with a ``user:password@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)
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1a4fabde..78b07f4b 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -471,8 +471,9 @@ class PackageIndex(Environment):
(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 @@ class PackageIndex(Environment):
return None
-
def gen_setup(self, filename, fragment, tmpdir):
match = EGG_FRAGMENT.match(fragment)
dists = match and [d for d in