diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/image/help.py | 2 | ||||
-rwxr-xr-x | scripts/wic | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py index ce42627cdb..93211498d5 100644 --- a/scripts/lib/image/help.py +++ b/scripts/lib/image/help.py | |||
@@ -81,11 +81,13 @@ def invoke_subcommand(args, parser, main_command_usage, subcommands): | |||
81 | if not args: | 81 | if not args: |
82 | logging.error("No subcommand specified, exiting") | 82 | logging.error("No subcommand specified, exiting") |
83 | parser.print_help() | 83 | parser.print_help() |
84 | return 1 | ||
84 | elif args[0] == "help": | 85 | elif args[0] == "help": |
85 | wic_help(args, main_command_usage, subcommands) | 86 | wic_help(args, main_command_usage, subcommands) |
86 | elif args[0] not in subcommands: | 87 | elif args[0] not in subcommands: |
87 | logging.error("Unsupported subcommand %s, exiting\n" % (args[0])) | 88 | logging.error("Unsupported subcommand %s, exiting\n" % (args[0])) |
88 | parser.print_help() | 89 | parser.print_help() |
90 | return 1 | ||
89 | else: | 91 | else: |
90 | usage = subcommands.get(args[0], subcommand_error)[1] | 92 | usage = subcommands.get(args[0], subcommand_error)[1] |
91 | subcommands.get(args[0], subcommand_error)[0](args[1:], usage) | 93 | subcommands.get(args[0], subcommand_error)[0](args[1:], usage) |
diff --git a/scripts/wic b/scripts/wic index dda72a9c27..a38ecc0b8b 100755 --- a/scripts/wic +++ b/scripts/wic | |||
@@ -305,7 +305,7 @@ def main(argv): | |||
305 | parser.print_help() | 305 | parser.print_help() |
306 | sys.exit(1) | 306 | sys.exit(1) |
307 | 307 | ||
308 | hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands) | 308 | return hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands) |
309 | 309 | ||
310 | 310 | ||
311 | if __name__ == "__main__": | 311 | if __name__ == "__main__": |