From ad92ed8e4f7f48a3d212962531d596b36f6b284f Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 13 Jun 2016 16:43:40 +1200 Subject: devtool: reset: allow specifying multiple recipes Allow specifying more than one recipe on the devtool reset command line. Also tweak the help text slightly. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index a2516d66ac..ed49a936b9 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1304,14 +1304,15 @@ def reset(args, config, basepath, workspace): if args.all: raise DevtoolError("Recipe cannot be specified if -a/--all is used") else: - check_workspace_recipe(workspace, args.recipename, checksrc=False) + for recipe in args.recipename: + check_workspace_recipe(workspace, recipe, checksrc=False) elif not args.all: raise DevtoolError("Recipe must be specified, or specify -a/--all to " "reset all recipes") if args.all: recipes = list(workspace.keys()) else: - recipes = [args.recipename] + recipes = args.recipename if recipes and not args.no_clean: if len(recipes) == 1: @@ -1449,9 +1450,9 @@ def register_commands(subparsers, context): parser_status.set_defaults(func=status) parser_reset = subparsers.add_parser('reset', help='Remove a recipe from your workspace', - description='Removes the specified recipe from your workspace (resetting its state)', + description='Removes the specified recipe(s) from your workspace (resetting its state back to that defined by the metadata).', group='working', order=-100) - parser_reset.add_argument('recipename', nargs='?', help='Recipe to reset') + parser_reset.add_argument('recipename', nargs='*', help='Recipe to reset') parser_reset.add_argument('--all', '-a', action="store_true", help='Reset all recipes (clear workspace)') parser_reset.add_argument('--no-clean', '-n', action="store_true", help='Don\'t clean the sysroot to remove recipe output') parser_reset.set_defaults(func=reset) -- cgit 1.2.3-korg