diff options
| -rw-r--r-- | CHANGES.txt | 1 | ||||
| -rw-r--r-- | CONTRIBUTORS.txt | 1 | ||||
| -rwxr-xr-x | setup.py | 4 |
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é @@ -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 |