From 21c5985812c889a4100114af06152c43cae78c1c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 17 Jun 2011 17:37:20 +0100 Subject: 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 --- bitbake/lib/bb/parse/ast.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bitbake/lib/bb/parse') diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 1180911a7d..bf70ad2658 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 []: -- cgit v1.2.3-54-g00ecf