From ed6611a588e2f21be60db11dc75f69e40500ea1f Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Thu, 25 Jun 2015 23:48:12 -0400 Subject: [PATCH] clint.py: don't print `--help` output to stderr and exit 1 a) It's not an error b) It requires manual redirection of stderr into stdout ('2>&1') in order to be viewed with a pager, which it warrants given how long the help message is. Helped-by: Florian Walch --- clint.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/clint.py b/clint.py index ccf1c11c3d..9715edd54e 100755 --- a/clint.py +++ b/clint.py @@ -3079,11 +3079,12 @@ def PrintUsage(message): Args: message: The optional error message. """ - sys.stderr.write(_USAGE) if message: + sys.stderr.write(_USAGE) sys.exit('\nFATAL ERROR: ' + message) else: - sys.exit(1) + sys.stdout.write(_USAGE) + sys.exit(0) def PrintCategories(): @@ -3091,7 +3092,7 @@ def PrintCategories(): These are the categories used to filter messages via --filter. """ - sys.stderr.write(''.join(' %s\n' % cat for cat in _ERROR_CATEGORIES)) + sys.stdout.write(''.join(' %s\n' % cat for cat in _ERROR_CATEGORIES)) sys.exit(0)