summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2005-07-24 05:51:07 +0000
committerPJ Eby <distutils-sig@python.org>2005-07-24 05:51:07 +0000
commit68b9a791009af00f1fb16fc3c59b0cc4de8ea7c9 (patch)
tree4aa38d6bef8f36739b3e2f21a4d56c8c2963913f
parentbaaa492f8f3100a24d723a7bb6c1d4c13295d5fb (diff)
downloadpython-setuptools-git-68b9a791009af00f1fb16fc3c59b0cc4de8ea7c9.tar.gz
Fix a regression; this code was changed in order to avoid being fooled by
incompatible eggs that might have ended up in the distribution directory, but the "fixed" code was broken. --HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041148
-rwxr-xr-xsetuptools/command/easy_install.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 110ad211..78620c0c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -766,9 +766,9 @@ See the setuptools documentation for the "develop" command for more info.
self.run_setup(setup_script, setup_base, args)
all_eggs = AvailableDistributions([dist_dir])
eggs = []
- for key in eggs:
- for dist in eggs[key]:
- eggs.append(self.install_egg(egg, setup_base))
+ for key in all_eggs:
+ for dist in all_eggs[key]:
+ eggs.append(self.install_egg(dist.location, setup_base))
if not eggs and not self.dry_run:
log.warn("No eggs found in %s (setup script problem?)",
dist_dir)