[Python-checkins] r46788 - sandbox/trunk/setuptools/ez_setup.py

[phillip.eby]

Author: phillip.eby
Date: Fri Jun  9 19:55:10 2006
New Revision: 46788

Modified:
   sandbox/trunk/setuptools/ez_setup.py
Log:
Fix mysterious errors during initial setuptools install, caused by 
ez_setup trying to run easy_install twice, due to a code fallthru
after deleting the egg from which it's running.


Modified: sandbox/trunk/setuptools/ez_setup.py
==============================================================================
--- sandbox/trunk/setuptools/ez_setup.py	(original)
+++ sandbox/trunk/setuptools/ez_setup.py	Fri Jun  9 19:55:10 2006
@@ -139,7 +139,7 @@
             egg = download_setuptools(version, to_dir=tmpdir, delay=0)
             sys.path.insert(0,egg)
             from setuptools.command.easy_install import main
-            main(list(argv)+[egg])
+            return main(list(argv)+[egg])   # we're done here
         finally:
             shutil.rmtree(tmpdir)
     else: