Jason R. Coombs avatar Jason R. Coombs committed ddca71a

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

Comments (0)

Files changed (2)

 =======
 
 ------
+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

             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'):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.