From d2bb9f08303bb120e811c03af2f5339e8f262cfa Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 22 Sep 2015 17:21:26 +0100 Subject: devtool / lib/oe/recipeutils: ensure we can parse without bbappends These functions ostensibly allowed parsing a recipe without bbappends but this clearly hadn't been tested because a variable was unassigned in both of them in that case. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/recipeutils.py | 2 ++ scripts/lib/devtool/__init__.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 190ac3a078..35b88d386c 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -72,6 +72,8 @@ def parse_recipe_simple(cooker, pn, d, appends=True): raise bb.providers.NoProvider('Unable to find any recipe file matching %s' % pn) if appends: appendfiles = cooker.collection.get_file_appends(recipefile) + else: + appendfiles = None return parse_recipe(recipefile, appendfiles, d) diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index fb699b5c61..3ea38028d4 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py @@ -134,6 +134,8 @@ def parse_recipe(config, tinfoil, pn, appends): # Filter out appends from the workspace append_files = [path for path in append_files if not path.startswith(config.workspace_path)] + else: + append_files = None return oe.recipeutils.parse_recipe(recipefile, append_files, tinfoil.config_data) -- cgit 1.2.3-korg