--help install command no longer tries to install fixes #121

--HG--
branch : distribute
extra : rebase_source : 11dab4d1ff0d41ef9b7e808ce7e41592b18a7270

3 files changed, 5 insertions, 1 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index b16ad40f..7d1ff003 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@ CHANGES
 * Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings
 * Added indexsidebar.html into MANIFEST.in
 * Issue 108: Fixed TypeError with Python3.1
+* Issue 121: Fixed --help install command trying to actually install.
 
 ------
 0.6.10
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index bc2b3fe7..da9e0219 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -10,6 +10,7 @@ Contributors
 * Jannis Leidel
 * Lennart Regebro
 * Martin von Löwis
+* Noufal Ibrahim
 * Philip Jenvey
 * Reinout van Rees
 * Tarek Ziadé
diff --git a/setup.py b/setup.py
index b8612b5c..064c2afd 100755
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,9 @@ def _being_installed():
         # Installed by buildout, don't mess with a global setuptools.
         return False
     # easy_install marker
-    return 'install' in sys.argv[1:] or _easy_install_marker()
+    if "--help" in sys.argv[1:] or "-h" in sys.argv[1:]: # Don't bother doing anything if they're just asking for help
+        return False
+    return  'install' in sys.argv[1:] or _easy_install_marker()
 
 if _being_installed():
     from distribute_setup import _before_install