[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command easy_install.py, 1.33, 1.34

pje@users.sourceforge.net pje at users.sourceforge.net
Tue Oct 18 06:08:49 CEST 2005


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

Modified Files:
	easy_install.py 
Log Message:
Hurray!  Our first dependency processing bug!  This is cool because it
means that people are finally doing enough things with setuptools to 
have real-life version conflict scenarios.  Luckily, the fix is trivial:
use breadth-first instead of depth-first dependency processing, which I 
thought we were already doing anyway, but weren't.  And we were giving
precedence to already-installed packages, which means upgrades didn't 
work so well.


Index: easy_install.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/easy_install.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- easy_install.py	16 Oct 2005 20:45:30 -0000	1.33
+++ easy_install.py	18 Oct 2005 04:08:46 -0000	1.34
@@ -394,7 +394,7 @@
             return
 
         try:
-            WorkingSet(self.shadow_path).resolve(
+            WorkingSet([]).resolve(
                 [requirement], self.local_index, self.easy_install
             )
         except DistributionNotFound, e:



More information about the Python-checkins mailing list