diff options
| -rwxr-xr-x | EasyInstall.txt | 4 | ||||
| -rwxr-xr-x | ez_setup.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index 4263c4ff..0fef81b6 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -1101,6 +1101,10 @@ Release Notes/Change History * 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 diff --git a/ez_setup.py b/ez_setup.py index 7bcf179f..b699ab0f 100755 --- a/ez_setup.py +++ b/ez_setup.py @@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``. 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 = { @@ -143,7 +143,7 @@ def main(argv, version=DEFAULT_VERSION): 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: |