[oe-commits] [bitbake] 02/02: cooker: Run registered anonymous python before displaying environment

[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.

commit bcdc2f73e3b4a10b1e479c2891f251d9507a9e30
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Fri Mar 2 18:17:05 2018 +0000

    cooker: Run registered anonymous python before displaying environment
    
    The output of bitbake -e can differ from what actually is used due
    to anonymous python making changes to the data store. Execute any
    anonymous python added in the base configuration to make things
    more consistent.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cooker.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index af482f9..d1df711 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -530,13 +530,15 @@ 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)
             logger.plain(env.getvalue())
 
         # emit the metadata which isnt valid shell
-        data.expandKeys(envdata)
         for e in sorted(envdata.keys()):
             if envdata.getVarFlag(e, 'func', False) and envdata.getVarFlag(e, 'python', False):
                 logger.plain("\npython %s () {\n%s}\n", e, envdata.getVar(e, False))

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