aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-03 23:28:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-03 23:29:55 +0000
commit6138897de5ac6becf3bff56ce7a78f3ec208fcdf (patch)
tree5e8b99d829bbd2384e6539c999c0ccd89fdd64a7
parentbcdc2f73e3b4a10b1e479c2891f251d9507a9e30 (diff)
downloadbitbake-6138897de5ac6becf3bff56ce7a78f3ec208fcdf.zip
bitbake-6138897de5ac6becf3bff56ce7a78f3ec208fcdf.tar.gz
bitbake-6138897de5ac6becf3bff56ce7a78f3ec208fcdf.tar.bz2
cooker: Fix environment double key expansion issue
The base configuration needs key expansion and anon python execution, the parsed configurations do not. Fix this consistently, its been broken and causing double key expansion for a while, only relised when we started double anonymous python exeution too. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cooker.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index d1df711..1fda40d 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -516,6 +516,8 @@ class BBCooker:
fn = runlist[0][3]
else:
envdata = self.data
+ data.expandKeys(envdata)
+ parse.ast.runAnonFuncs(envdata)
if fn:
try:
@@ -530,9 +532,6 @@ class BBCooker:
self.data.inchistory.emit(env)
logger.plain(env.getvalue())
- data.expandKeys(envdata)
- parse.ast.runAnonFuncs(envdata)
-
# emit variables and shell functions
with closing(StringIO()) as env:
data.emit_env(env, envdata, True)