diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-09-22 17:21:26 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-23 09:53:15 +0100 |
| commit | 99fc284545d3a493ce57e904c233e0130022dae7 (patch) | |
| tree | b985aeb2d5528f6256855ce995e26ad972731efb | |
| parent | 5d1a117f44bd78d97ebefb1539b18ac9e564e0fc (diff) | |
| download | poky-99fc284545d3a493ce57e904c233e0130022dae7.tar.gz | |
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.
(From OE-Core rev: d2bb9f08303bb120e811c03af2f5339e8f262cfa)
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.py | 2 | ||||
| -rw-r--r-- | scripts/lib/devtool/__init__.py | 2 |
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): | |||
| 72 | raise bb.providers.NoProvider('Unable to find any recipe file matching %s' % pn) | 72 | raise bb.providers.NoProvider('Unable to find any recipe file matching %s' % pn) |
| 73 | if appends: | 73 | if appends: |
| 74 | appendfiles = cooker.collection.get_file_appends(recipefile) | 74 | appendfiles = cooker.collection.get_file_appends(recipefile) |
| 75 | else: | ||
| 76 | appendfiles = None | ||
| 75 | return parse_recipe(recipefile, appendfiles, d) | 77 | return parse_recipe(recipefile, appendfiles, d) |
| 76 | 78 | ||
| 77 | 79 | ||
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): | |||
| 134 | # Filter out appends from the workspace | 134 | # Filter out appends from the workspace |
| 135 | append_files = [path for path in append_files if | 135 | append_files = [path for path in append_files if |
| 136 | not path.startswith(config.workspace_path)] | 136 | not path.startswith(config.workspace_path)] |
| 137 | else: | ||
| 138 | append_files = None | ||
| 137 | return oe.recipeutils.parse_recipe(recipefile, append_files, | 139 | return oe.recipeutils.parse_recipe(recipefile, append_files, |
| 138 | tinfoil.config_data) | 140 | tinfoil.config_data) |
| 139 | 141 | ||
