aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-09 18:59:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-09 18:59:29 +0100
commitac15028391fdcc3fec2dd0e64a4f763ce63e5449 (patch)
treed5df4a79365ea8168d36dfa5ee11883b984f8115
parentfd9893c338df7828b2c01f1d548aa86dfcf7c50a (diff)
downloadbitbake-master.zip
bitbake-master.tar.gz
bitbake-master.tar.bz2
main: Fix environment handling for UI module importsHEADmaster
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@linuxfoundation.org>
-rwxr-xr-xlib/bb/main.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/bb/main.py b/lib/bb/main.py
index f4474e4..732a315 100755
--- a/lib/bb/main.py
+++ b/lib/bb/main.py
@@ -405,9 +405,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
@@ -423,6 +420,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,