diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index d5900b4f82..018ef2a987 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -25,7 +25,7 @@ import logging | |||
25 | import argparse | 25 | import argparse |
26 | import scriptutils | 26 | import scriptutils |
27 | import errno | 27 | import errno |
28 | from devtool import exec_build_env_command, setup_tinfoil, DevtoolError | 28 | from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, DevtoolError |
29 | from devtool import parse_recipe | 29 | from devtool import parse_recipe |
30 | 30 | ||
31 | logger = logging.getLogger('devtool') | 31 | logger = logging.getLogger('devtool') |
@@ -776,9 +776,7 @@ def _guess_recipe_update_mode(srctree, rdata): | |||
776 | 776 | ||
777 | def update_recipe(args, config, basepath, workspace): | 777 | def update_recipe(args, config, basepath, workspace): |
778 | """Entry point for the devtool 'update-recipe' subcommand""" | 778 | """Entry point for the devtool 'update-recipe' subcommand""" |
779 | if not args.recipename in workspace: | 779 | check_workspace_recipe(workspace, args.recipename) |
780 | raise DevtoolError("no recipe named %s in your workspace" % | ||
781 | args.recipename) | ||
782 | 780 | ||
783 | if args.append: | 781 | if args.append: |
784 | if not os.path.exists(args.append): | 782 | if not os.path.exists(args.append): |
@@ -830,9 +828,8 @@ def reset(args, config, basepath, workspace): | |||
830 | if args.recipename: | 828 | if args.recipename: |
831 | if args.all: | 829 | if args.all: |
832 | raise DevtoolError("Recipe cannot be specified if -a/--all is used") | 830 | raise DevtoolError("Recipe cannot be specified if -a/--all is used") |
833 | elif not args.recipename in workspace: | 831 | else: |
834 | raise DevtoolError("no recipe named %s in your workspace" % | 832 | check_workspace_recipe(workspace, args.recipename, checksrc=False) |
835 | args.recipename) | ||
836 | elif not args.all: | 833 | elif not args.all: |
837 | raise DevtoolError("Recipe must be specified, or specify -a/--all to " | 834 | raise DevtoolError("Recipe must be specified, or specify -a/--all to " |
838 | "reset all recipes") | 835 | "reset all recipes") |