From 07f1a31c3eb453aab91646834087f3258254990f Mon Sep 17 00:00:00 2001 From: tarek Date: Sun, 18 Oct 2009 14:46:54 +0200 Subject: no_fake needs to be True by default fixes #74 --HG-- branch : distribute extra : rebase_source : 158f5abb9528d7ea6cd436996d5022cb6bcda89e --- distribute_setup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'distribute_setup.py') diff --git a/distribute_setup.py b/distribute_setup.py index d9912010..e7aafbb1 100644 --- a/distribute_setup.py +++ b/distribute_setup.py @@ -124,7 +124,7 @@ def _do_download(version, download_base, to_dir, download_delay): def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, - to_dir=os.curdir, download_delay=15, no_fake=False): + to_dir=os.curdir, download_delay=15, no_fake=True): # making sure we use the absolute path to_dir = os.path.abspath(to_dir) was_imported = 'pkg_resources' in sys.modules or \ @@ -134,7 +134,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, import pkg_resources if not hasattr(pkg_resources, '_distribute'): if not no_fake: - fake_setuptools() + _fake_setuptools() raise ImportError except ImportError: return _do_download(version, download_base, to_dir, download_delay) @@ -159,7 +159,8 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, return _do_download(version, download_base, to_dir, download_delay) finally: - _create_fake_setuptools_pkg_info(to_dir) + if not no_fake: + _create_fake_setuptools_pkg_info(to_dir) def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, delay=15): @@ -319,7 +320,7 @@ def _patch_egg_dir(path): def _before_install(): log.warn('Before install bootstrap.') - fake_setuptools() + _fake_setuptools() def _under_prefix(location): @@ -340,7 +341,7 @@ def _under_prefix(location): return True -def fake_setuptools(): +def _fake_setuptools(): log.warn('Scanning installed packages') try: import pkg_resources -- cgit v1.2.3