[oe-commits] [bitbake] branch 1.36 updated: main: Fix environment handling for UI module imports

[git at git.openembedded.org]

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

rpurdie pushed a commit to branch 1.36
in repository bitbake.

The following commit(s) were added to refs/heads/1.36 by this push:
     new 2e4845c  main: Fix environment handling for UI module imports
2e4845c is described below

commit 2e4845c526117d5524cff910afbb6f8212a3e199
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Oct 9 18:59:25 2018 +0100

    main: Fix environment handling for UI module imports
    
    The environment was being cleared before the UI imports occurred which
    caused problems for graphical UIs like taskexp. The full environment was
    intended to be available to UI clients and it was only meant to be cleared
    for the server/cooker, so tweak the code order so this is the case.
    
    This fixes problems reported for taskexp.
    
    [YOCTO #12670]
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/main.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/bb/main.py b/lib/bb/main.py
index 7711b29..85d9332 100755
--- a/lib/bb/main.py
+++ b/lib/bb/main.py
@@ -401,9 +401,6 @@ def setup_bitbake(configParams, configuration, extrafeatures=None):
         # In status only mode there are no logs and no UI
         logger.addHandler(handler)
 
-    # Clear away any spurious environment variables while we stoke up the cooker
-    cleanedvars = bb.utils.clean_environment()
-
     if configParams.server_only:
         featureset = []
         ui_module = None
@@ -419,6 +416,10 @@ def setup_bitbake(configParams, configuration, extrafeatures=None):
 
     server_connection = None
 
+    # Clear away any spurious environment variables while we stoke up the cooker
+    # (done after import_extension_module() above since for example import gi triggers env var usage)
+    cleanedvars = bb.utils.clean_environment()
+
     if configParams.remote_server:
         # Connect to a remote XMLRPC server
         server_connection = bb.server.xmlrpcclient.connectXMLRPC(configParams.remote_server, featureset,

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