[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command easy_install.py, 1.17, 1.18

[pje@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2120/setuptools/command

Modified Files:
	easy_install.py 
Log Message:
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.


Index: easy_install.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/easy_install.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- easy_install.py	24 Jul 2005 02:41:44 -0000	1.17
+++ easy_install.py	24 Jul 2005 05:51:07 -0000	1.18
@@ -766,9 +766,9 @@
             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)