Removed an 'else'

b7f77fce · Reinout van Rees · 8f227667 · b7f77fce
Commit b7f77fce authored Oct 31, 2014 by Reinout van Rees
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

src/zc/buildout/easy_install.py src/zc/buildout/easy_install.py +6 -7

No files found.
--- a/src/zc/buildout/easy_install.py
+++ b/src/zc/buildout/easy_install.py
@@ -656,13 +656,12 @@ class Installer:
                        "Version conflict while processing requirement %s "
                        "(constrained to %s)",
                        current_requirement, req)
-                    if req.key in ['zc.buildout', 'setuptools']:
+                    # When bootstrapping zc.buildout, we might be doing it
-                        # We're bootstrapping zc.buildout with a different
+                    # with a different version than the one we specified in
-                        # version than the one we specified in our versions
+                    # our versions list. Reason: the bootstrap grabs the
-                        # list. Ignore the error it and we'll grab the right
+                    # latest buildout. Same with setuptools.
-                        # one below.
+                    # So ignore the version conflict for those two packages.
-                        dist = None
+                    if req.key not in ['zc.buildout', 'setuptools']:
-                    else:
                        raise VersionConflict(err, ws)
            if dist is None:
                if dest: