summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-09-22 17:21:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-22 18:12:55 +0100
commitd2bb9f08303bb120e811c03af2f5339e8f262cfa (patch)
treeb46c83081c9b57ececf9c0b05cd69cf5253d85a9
parent670bd063a5e0cdf89ea8d1f763af980d7e63d38a (diff)
downloadopenembedded-core-contrib-d2bb9f08303bb120e811c03af2f5339e8f262cfa.tar.gz
openembedded-core-contrib-d2bb9f08303bb120e811c03af2f5339e8f262cfa.tar.bz2
openembedded-core-contrib-d2bb9f08303bb120e811c03af2f5339e8f262cfa.zip
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 <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/recipeutils.py2
-rw-r--r--scripts/lib/devtool/__init__.py2
2 files changed, 4 insertions, 0 deletions
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)