diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-17 17:37:20 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-28 15:27:42 +0100 |
| commit | 21c5985812c889a4100114af06152c43cae78c1c (patch) | |
| tree | 91f8400eb1e448de89bebc1682aae1af1c410b90 | |
| parent | 1b5d7b59d330b49a25fe60aea22c2f3b59bfb5e1 (diff) | |
| download | ast2050-yocto-poky-21c5985812c889a4100114af06152c43cae78c1c.zip ast2050-yocto-poky-21c5985812c889a4100114af06152c43cae78c1c.tar.gz | |
bitbake/ast: Call expandkeys after the RecipePreFinalise event
This means the event handler can change variables such as PN and those
changes will be reflected in the updated variable key names.
(Bitbake rev: 664b85742d1afc94b291a85fd245abebffacdf3d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/parse/ast.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 1180911..bf70ad2 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py @@ -307,8 +307,6 @@ def handleInherit(statements, filename, lineno, m): statements.append(InheritNode(filename, lineno, classes.split())) def finalize(fn, d, variant = None): - bb.data.expandKeys(d) - all_handlers = {} for var in bb.data.getVar('__BBHANDLERS', d) or []: # try to add the handler @@ -317,6 +315,7 @@ def finalize(fn, d, variant = None): bb.event.fire(bb.event.RecipePreFinalise(fn), d) + bb.data.expandKeys(d) bb.data.update_data(d) code = [] for funcname in bb.data.getVar("__BBANONFUNCS", d) or []: |
