diff options
| author | tarek <none@none> | 2009-10-10 18:11:26 +0200 |
|---|---|---|
| committer | tarek <none@none> | 2009-10-10 18:11:26 +0200 |
| commit | 71127d47493fdde7862410afce593b6a0607863b (patch) | |
| tree | 506d9d5bbfb8f0a380092ed06a9206531af79961 /distribute_setup.py | |
| parent | ac54adff1c0ba86a9f98adf791a92a493f8c1e7d (diff) | |
| download | external_python_setuptools-71127d47493fdde7862410afce593b6a0607863b.tar.gz external_python_setuptools-71127d47493fdde7862410afce593b6a0607863b.tar.bz2 external_python_setuptools-71127d47493fdde7862410afce593b6a0607863b.zip | |
returning if setuptools is not found0.6.4
--HG--
branch : distribute
extra : rebase_source : e39726368ef61d71c6bf4b023ba050083584a941
Diffstat (limited to 'distribute_setup.py')
| -rw-r--r-- | distribute_setup.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/distribute_setup.py b/distribute_setup.py index b40a9499..59424ccc 100644 --- a/distribute_setup.py +++ b/distribute_setup.py @@ -240,13 +240,14 @@ def _remove_flat_installation(placeholder): break if not found: log.warn('Could not locate setuptools*.egg-info') + return + + log.warn('Removing elements out of the way...') + pkg_info = os.path.join(placeholder, file) + if os.path.isdir(pkg_info): + patched = _patch_egg_dir(pkg_info) else: - log.warn('Removing elements out of the way...') - pkg_info = os.path.join(placeholder, file) - if os.path.isdir(pkg_info): - patched = _patch_egg_dir(pkg_info) - else: - patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO) + patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO) if not patched: log.warn('%s already patched.', pkg_info) |