[Python-checkins] r58374 - in sandbox/branches/setuptools-0.6: EasyInstall.txt setuptools/command/easy_install.py

[phillip.eby]

Author: phillip.eby
Date: Mon Oct  8 13:49:52 2007
New Revision: 58374

Modified:
   sandbox/branches/setuptools-0.6/EasyInstall.txt
   sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
Log:
Prevent ``--help-commands`` and other junk from showing under Python 2.5
when running ``easy_install --help``.  (backport from trunk)


Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Mon Oct  8 13:49:52 2007
@@ -1233,6 +1233,10 @@
 Release Notes/Change History
 ============================
 
+0.6final
+ * Prevent ``--help-commands`` and other junk from showing under Python 2.5
+   when running ``easy_install --help``.
+
 0.6c7
  * ``ftp:`` download URLs now work correctly.
 

Modified: sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py	Mon Oct  8 13:49:52 2007
@@ -1661,6 +1661,7 @@
             distutils.core.gen_usage = old_gen_usage
 
     class DistributionWithoutHelpCommands(Distribution):
+        common_usage = ""
         def _show_help(self,*args,**kw):
             with_ei_usage(lambda: Distribution._show_help(self,*args,**kw))
 
@@ -1678,4 +1679,3 @@
 
 
 
-