fixed use_setuptools

--HG--
branch : distribute
extra : rebase_source : ef32212ac795e851f32e63d1ec9fd7e3765caf92

3 files changed, 23 insertions, 0 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index f07d4cb8..6761b98e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,8 @@ CHANGES
   PyPI's http://packages.python.org.
   This close http://bitbucket.org/tarek/distribute/issue/56.
 
+* Fixed a bootstrap bug on the use_setuptools() API.
+
 -----
 0.6.3
 -----
diff --git a/README.txt b/README.txt
index c480aef1..629a677f 100755
--- a/README.txt
+++ b/README.txt
@@ -143,6 +143,26 @@ Lastly:
 - remove the *.OLD.* directory located in your site-packages directory if any,
   **once you have checked everything was working correctly again**.
 
+-------------------------
+Quick help for developers
+-------------------------
+
+To use Distribute in your package, the recommended way is to ship
+`distribute_setup.py` alongside your `setup.py` script and call 
+it at the very begining of `setup.py` like this::
+
+    from distribute_setup import use_setuptools
+    use_setuptools()
+
+
+Another way is to add ``Distribute`` in the ``install_requires`` option::
+
+    from setuptools import setup
+
+    setup(...
+          install_requires=['distribute']
+    )
+
 -----------
 Install FAQ
 -----------
diff --git a/distribute_setup.py b/distribute_setup.py
index dcea856e..bde6c762 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -132,6 +132,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     try:
         import pkg_resources
         if not hasattr(pkg_resources, '_distribute'):
+            fake_setuptools()
             raise ImportError
     except ImportError:
         return _do_download(version, download_base, to_dir, download_delay)