diff options
Diffstat (limited to 'ez_setup.py')
| -rw-r--r-- | ez_setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ez_setup.py b/ez_setup.py index 0cc4a055..4703ed29 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -133,6 +133,8 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, try: pkg_resources.require("setuptools>=" + version) return + except pkg_resources.DistributionNotFound: + return _do_download(version, download_base, to_dir, download_delay) except pkg_resources.VersionConflict: if was_imported: msg = textwrap.dedent(""" @@ -149,8 +151,6 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, # otherwise, reload ok del pkg_resources, sys.modules['pkg_resources'] return _do_download(version, download_base, to_dir, download_delay) - except pkg_resources.DistributionNotFound: - return _do_download(version, download_base, to_dir, download_delay) def _clean_check(cmd, target): """ |