diff options
Diffstat (limited to 'distribute_setup.py')
| -rw-r--r-- | distribute_setup.py | 3 |
1 files changed, 2 insertions, 1 deletions
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'): |