summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-17 16:37:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-28 14:27:42 (GMT)
commit21c5985812c889a4100114af06152c43cae78c1c (patch)
tree91f8400eb1e448de89bebc1682aae1af1c410b90 /bitbake
parent1b5d7b59d330b49a25fe60aea22c2f3b59bfb5e1 (diff)
downloadpoky-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>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/parse/ast.py3
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):
307 statements.append(InheritNode(filename, lineno, classes.split())) 307 statements.append(InheritNode(filename, lineno, classes.split()))
308 308
309def finalize(fn, d, variant = None): 309def finalize(fn, d, variant = None):
310 bb.data.expandKeys(d)
311
312 all_handlers = {} 310 all_handlers = {}
313 for var in bb.data.getVar('__BBHANDLERS', d) or []: 311 for var in bb.data.getVar('__BBHANDLERS', d) or []:
314 # try to add the handler 312 # try to add the handler
@@ -317,6 +315,7 @@ def finalize(fn, d, variant = None):
317 315
318 bb.event.fire(bb.event.RecipePreFinalise(fn), d) 316 bb.event.fire(bb.event.RecipePreFinalise(fn), d)
319 317
318 bb.data.expandKeys(d)
320 bb.data.update_data(d) 319 bb.data.update_data(d)
321 code = [] 320 code = []
322 for funcname in bb.data.getVar("__BBANONFUNCS", d) or []: 321 for funcname in bb.data.getVar("__BBANONFUNCS", d) or []: