[oe-commits] [bitbake] branch master-next updated: cooker: Fix environment double key expansion issue

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

The following commit(s) were added to refs/heads/master-next by this push:
     new 6138897  cooker: Fix environment double key expansion issue
6138897 is described below

commit 6138897de5ac6becf3bff56ce7a78f3ec208fcdf
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sat Mar 3 23:28:08 2018 +0000

    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 at linuxfoundation.org>
---
 lib/bb/cooker.py | 5 ++---
 1 file 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.