diff options
| -rwxr-xr-x | EasyInstall.txt | 4 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index f8f5ca57..ab7026cd 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -1233,6 +1233,10 @@ displayed MD5 info (broken onto two lines for readability):: 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. diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index c1d2fe4f..0bebe698 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1661,6 +1661,7 @@ usage: %(script)s [options] requirement_or_url ... 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 @@ usage: %(script)s [options] requirement_or_url ... - |