diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-29 07:35:38 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-29 07:35:38 -0400 |
| commit | 09b0b938b617e6b4f26a2cd1bf6c9e62ebbc6b57 (patch) | |
| tree | 0d134831ab3a3255d19c6abd3614d60a131d32be | |
| parent | b39c770280a208f82159352d2bdf086775b46d92 (diff) | |
| download | external_python_setuptools-09b0b938b617e6b4f26a2cd1bf6c9e62ebbc6b57.tar.gz external_python_setuptools-09b0b938b617e6b4f26a2cd1bf6c9e62ebbc6b57.tar.bz2 external_python_setuptools-09b0b938b617e6b4f26a2cd1bf6c9e62ebbc6b57.zip | |
Catch VersionConflict in distribute_setup when checking for setuptools 0.7 (to allow upgrade from setuptools to distribute). Fixes #3790.6.45
--HG--
branch : distribute
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | distribute_setup.py | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index e18a534b..ac7f59d1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,13 @@ CHANGES ======= ------ +0.6.45 +------ + +* Issue #379: ``distribute_setup.py`` now traps VersionConflict as well, + restoring ability to upgrade from an older setuptools version. + +------ 0.6.44 ------ diff --git a/distribute_setup.py b/distribute_setup.py index a9c00982..c67b7524 100644 --- a/distribute_setup.py +++ b/distribute_setup.py @@ -150,7 +150,8 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, try: pkg_resources.require("setuptools>=0.7b") return - except pkg_resources.DistributionNotFound: + except (pkg_resources.DistributionNotFound, + pkg_resources.VersionConflict): pass if not hasattr(pkg_resources, '_distribute'): |