mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

devtool: edit-recipe: fix regression

Browse Source 
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.

(From OE-Core rev: d5191840212adbf480961ba6fc68e1ab17e5a77a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2017-08-31 11:54:09 +12:00
committed by Richard Purdie
parent 69d50eb9ec
commit dd5ceaefc0
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/devtool/utilcmds.py
+11 -4
View File
@@ -30,14 +30,13 @@ from devtool import parse_recipe
logger = logging.getLogger('devtool') logger = logging.getLogger('devtool')
def find_recipe(args, config, basepath, workspace): def _find_recipe_path(args, config, basepath, workspace):
"""Entry point for the devtool 'find-recipe' subcommand"""
if args.any_recipe: if args.any_recipe:
tinfoil = setup_tinfoil(config_only=False, basepath=basepath) tinfoil = setup_tinfoil(config_only=False, basepath=basepath)
try: try:
rd = parse_recipe(config, tinfoil, args.recipename, True) rd = parse_recipe(config, tinfoil, args.recipename, True)
if not rd: if not rd:
return 1 raise DevtoolError("Failed to find specified recipe")
recipefile = rd.getVar('FILE') recipefile = rd.getVar('FILE')
finally: finally:
tinfoil.shutdown() tinfoil.shutdown()
@@ -47,11 +46,19 @@ def find_recipe(args, config, basepath, workspace):
if not recipefile: if not recipefile:
raise DevtoolError("Recipe file for %s is not under the workspace" % raise DevtoolError("Recipe file for %s is not under the workspace" %
args.recipename) 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): def edit_recipe(args, config, basepath, workspace):
"""Entry point for the devtool 'edit-recipe' subcommand""" """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): def configure_help(args, config, basepath, workspace):