diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-06-16 14:19:49 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-23 11:38:16 +0100 |
| commit | ebd9f7b1da8ed556e98aab4d5f4e81707ac44b27 (patch) | |
| tree | 4ce03ddbd3836188bd6ed066c89d63be5c38924a /scripts | |
| parent | 0997208266686473d23aed0fab58a1fd7c5d8cae (diff) | |
| download | openembedded-core-contrib-ebd9f7b1da8ed556e98aab4d5f4e81707ac44b27.tar.gz | |
wic: Return error code when wic fails to invoke command
Return 1 if command doesn't exist or wic is called without
any commmand.
Return result of invoke_command as wic return code.
Added tests for unsupported command and no command.
Fixed typo in test case test02_createhelp spotted by this fix.
[YOCTO #7856]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
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): if not args: logging.error("No subcommand specified, exiting") parser.print_help() + return 1 elif args[0] == "help": wic_help(args, main_command_usage, subcommands) elif args[0] not in subcommands: logging.error("Unsupported subcommand %s, exiting\n" % (args[0])) parser.print_help() + return 1 else: usage = subcommands.get(args[0], subcommand_error)[1] 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): parser.print_help() sys.exit(1) - hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands) + return hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands) if __name__ == "__main__": |