diff options
| -rw-r--r-- | bootstrap.py | 9 | ||||
| -rw-r--r-- | tests/install_test.py | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/bootstrap.py b/bootstrap.py index 9908429b..40505c55 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -181,7 +181,7 @@ def _rename_path(path): def _remove_flat_installation(placeholder): if not os.path.isdir(placeholder): - log.warn('Unkown installation') + log.warn('Unkown installation at %s' % placeholder) return False found = False for file in os.listdir(placeholder): @@ -295,9 +295,10 @@ def main(argv, version=DEFAULT_VERSION): import setuptools if not hasattr(setuptools, '_distribute'): placeholder = os.path.split(os.path.dirname(setuptools.__file__))[0] - res = _remove_flat_installation(placeholder) - if res: - _relaunch() + if not placeholder.endswith('.egg'): + res = _remove_flat_installation(placeholder) + if res: + _relaunch() print >> sys.stderr, ( "The patch didn't work, Setuptools is still active.\n" "Possible reason: your have a system-wide setuptools installed " diff --git a/tests/install_test.py b/tests/install_test.py index 52a46c00..56ab13cc 100644 --- a/tests/install_test.py +++ b/tests/install_test.py @@ -64,6 +64,7 @@ try: else: print '**** Test failed, please send me the output at tarek@ziade.org' finally: - os.remove(script_name) + if os.path.exists(script_name): + os.remove(script_name) os.remove('bootstrap.py') |