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 | 1d6342d883446cf152890945f481f908de2ada42 (patch) | |
| tree | b2552853bba43723fd22ecbf9dd0e595a25e91b9 | |
| parent | fae55f08b2c4be27518e672e519f6636e79c6ddf (diff) | |
| download | python-setuptools-bitbucket-1d6342d883446cf152890945f481f908de2ada42.tar.gz | |
Catch VersionConflict in distribute_setup when checking for setuptools 0.7 (to allow upgrade from setuptools to distribute). Fixes #3790.6.45
| -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'): |