Catch VersionConflict in distribute_setup when checking for setuptools 0.7 (to...

Catch VersionConflict in distribute_setup when checking for setuptools 0.7 (to allow upgrade from setuptools to distribute). Fixes #379

--HG--
branch : distribute

CHANGES.txt

@@ -2,6 +2,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
 ------

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'):