diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-08-24 16:01:03 +1200 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-08-31 11:50:26 +1200 |
commit | 429f3568136772dc984473000448caac387b4e58 (patch) | |
tree | 10e7b1fa91df8d7ef76a5b690b10fff958da91f4 | |
parent | 3802cb118d22915c5592550349a4e8af5d116223 (diff) | |
download | openembedded-core-contrib-429f3568136772dc984473000448caac387b4e58.tar.gz |
devtool: edit-recipe: fix regression
OE-Core commit 5a16b3c804c5eca331a1c08a7ce31a54909af105 attempted to use
the same function to get the path to a recipe as the new "find-recipe"
command it implemented, except that cannot work because (a) it didn't
return anything and (b) event if it had tried, a command function can
only return an exit code and we don't want that for find-recipe if it
succeeded. Split out a separate reusable function for both commands.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r-- | scripts/lib/devtool/utilcmds.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/scripts/lib/devtool/utilcmds.py b/scripts/lib/devtool/utilcmds.py index c8cb760e4b..b74511643f 100644 --- a/scripts/lib/devtool/utilcmds.py +++ b/scripts/lib/devtool/utilcmds.py @@ -30,14 +30,13 @@ from devtool import parse_recipe logger = logging.getLogger('devtool') -def find_recipe(args, config, basepath, workspace): - """Entry point for the devtool 'find-recipe' subcommand""" +def _find_recipe_path(args, config, basepath, workspace): if args.any_recipe: tinfoil = setup_tinfoil(config_only=False, basepath=basepath) try: rd = parse_recipe(config, tinfoil, args.recipename, True) if not rd: - return 1 + raise DevtoolError("Failed to find specified recipe") recipefile = rd.getVar('FILE') finally: tinfoil.shutdown() @@ -47,11 +46,19 @@ def find_recipe(args, config, basepath, workspace): if not recipefile: raise DevtoolError("Recipe file for %s is not under the workspace" % args.recipename) + return recipefile + + +def find_recipe(args, config, basepath, workspace): + """Entry point for the devtool 'find-recipe' subcommand""" + recipefile = _find_recipe_path(args, config, basepath, workspace) + print(recipefile) + return 0 def edit_recipe(args, config, basepath, workspace): """Entry point for the devtool 'edit-recipe' subcommand""" - return scriptutils.run_editor(find_recipe(args, config, basepath, workspace), logger) + return scriptutils.run_editor(_find_recipe_path(args, config, basepath, workspace), logger) def configure_help(args, config, basepath, workspace): |