[oe-commits] Paul Eggleton : devtool / lib/oe/recipeutils: ensure we can parse without bbappends
git at git.openembedded.org
git at git.openembedded.org
Wed Sep 23 08:56:09 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: d2bb9f08303bb120e811c03af2f5339e8f262cfa
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d2bb9f08303bb120e811c03af2f5339e8f262cfa
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Tue Sep 22 17:21:26 2015 +0100
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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 190ac3a..35b88d3 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 fb699b5..3ea3802 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)
More information about the Openembedded-commits
mailing list