Author: aconway Date: Mon Dec 1 21:10:51 2014 New Revision: 1642758 URL: http://svn.apache.org/r1642758 Log: NO-JIRA: qpid-ha don't return error status if called with -h or --help flag.
Modified: qpid/trunk/qpid/tools/src/py/qpid-ha Modified: qpid/trunk/qpid/tools/src/py/qpid-ha URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-ha?rev=1642758&r1=1642757&r2=1642758&view=diff ============================================================================== --- qpid/trunk/qpid/tools/src/py/qpid-ha (original) +++ qpid/trunk/qpid/tools/src/py/qpid-ha Mon Dec 1 21:10:51 2014 @@ -261,8 +261,11 @@ def main_except(argv): if "--cluster-manager" in args: commands += ManagerCommand.manager_commands args.remove("--cluster-manager") - if "--help-all" in args: - for c in commands: c.op.print_help(); print + if len(args) and args[0] in ['help', '--help', '-help', '-h', 'help-all', '--help-all']: + if 'help-all' in args[0]: + for c in commands: c.op.print_help(); print + else: + print_usage(os.path.basename(argv[0])); else: command = find_command(args, commands) if command: --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org