From c3ddb31d4d8ce58251b4876882a757cd643c097f Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Thu, 7 Jun 2018 10:47:59 +0100 Subject: [PATCH] fw/entrypoint: Fix help information for '--help' argument In a previous commit we filtered parameters so that '-h' is never passed to 'parse_known_commands' to ensure our own custom help message is displayed, now also filter for '--help' for the same reason. --- wa/framework/entrypoint.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wa/framework/entrypoint.py b/wa/framework/entrypoint.py index 281790f7..c19989e1 100644 --- a/wa/framework/entrypoint.py +++ b/wa/framework/entrypoint.py @@ -86,11 +86,13 @@ def main(): argv = split_joined_options(sys.argv[1:]) # 'Parse_known_args' automatically displays the default help and exits - # if '-h' is detected, we want our custom help messages so ensure this - # is never passed as a parameter. + # if '-h' or '--help' is detected, we want our custom help messages so + # ensure these are never passed as parameters. filtered_argv = list(argv) if '-h' in filtered_argv: filtered_argv.remove('-h') + elif '--help' in filtered_argv: + filtered_argv.remove('--help') args, _ = parser.parse_known_args(filtered_argv) settings.set("verbosity", args.verbose)