diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-02-16 09:53:52 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-02-16 09:53:52 -0500 |
| commit | cd6f8d58314ce146b18142f4be56fc2a18f977d5 (patch) | |
| tree | ef0eed73cb886424f7d38f64d80114ae6ee590c0 /ez_setup.py | |
| parent | e1bc6caa509afc1df671a21b94d33906a88930d9 (diff) | |
| download | external_python_setuptools-cd6f8d58314ce146b18142f4be56fc2a18f977d5.tar.gz external_python_setuptools-cd6f8d58314ce146b18142f4be56fc2a18f977d5.tar.bz2 external_python_setuptools-cd6f8d58314ce146b18142f4be56fc2a18f977d5.zip | |
Collapse common behavior
Diffstat (limited to 'ez_setup.py')
| -rw-r--r-- | ez_setup.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ez_setup.py b/ez_setup.py index 0734d6c5..a1c69d0b 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -163,8 +163,8 @@ def use_setuptools( # a suitable version is already installed return except pkg_resources.DistributionNotFound: - # no version of setuptools was found - return _do_download(version, download_base, to_dir, download_delay) + # no version of setuptools was found; allow download + pass except pkg_resources.VersionConflict as VC_err: if imported: # setuptools was imported prior to invocation of this function, @@ -177,7 +177,8 @@ def use_setuptools( # take precedence. del pkg_resources _unload_pkg_resources() - return _do_download(version, download_base, to_dir, download_delay) + + return _do_download(version, download_base, to_dir, download_delay) def _unload_pkg_resources(): |