Commits

phillip.eby  committed 836c0f9

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.
(merge from trunk)

  • Participants
  • Parent commits dabaf31
  • Branches setuptools-0.6

Comments (0)

Files changed (2)

File EasyInstall.txt

  * Fix sometimes not detecting local packages installed outside of "site"
    directories.
 
+ * 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.
+
 0.6b2
  * Don't install or update a ``site.py`` patch when installing to a
    ``PYTHONPATH`` directory with ``--multi-version``, unless an
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6b3"
+DEFAULT_VERSION = "0.6b2"
 DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
             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: