summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-09 17:59:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-23 15:57:32 (GMT)
commit8883ee32f2a77bf532832d4fad5c20912a1a3630 (patch)
tree54ec3ac53145d3c7bccbf4a13574a24a92b9f8bc
parent9f65c15e14c874e00dddf5631529f2c527006e9d (diff)
downloadpoky-8883ee32f2a77bf532832d4fad5c20912a1a3630.tar.gz
bitbake: 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] (Bitbake rev: 2e4845c526117d5524cff910afbb6f8212a3e199) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/main.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index 7711b29..85d9332 100755
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -401,9 +401,6 @@ def setup_bitbake(configParams, configuration, extrafeatures=None):
401 # In status only mode there are no logs and no UI 401 # In status only mode there are no logs and no UI
402 logger.addHandler(handler) 402 logger.addHandler(handler)
403 403
404 # Clear away any spurious environment variables while we stoke up the cooker
405 cleanedvars = bb.utils.clean_environment()
406
407 if configParams.server_only: 404 if configParams.server_only:
408 featureset = [] 405 featureset = []
409 ui_module = None 406 ui_module = None
@@ -419,6 +416,10 @@ def setup_bitbake(configParams, configuration, extrafeatures=None):
419 416
420 server_connection = None 417 server_connection = None
421 418
419 # Clear away any spurious environment variables while we stoke up the cooker
420 # (done after import_extension_module() above since for example import gi triggers env var usage)
421 cleanedvars = bb.utils.clean_environment()
422
422 if configParams.remote_server: 423 if configParams.remote_server:
423 # Connect to a remote XMLRPC server 424 # Connect to a remote XMLRPC server
424 server_connection = bb.server.xmlrpcclient.connectXMLRPC(configParams.remote_server, featureset, 425 server_connection = bb.server.xmlrpcclient.connectXMLRPC(configParams.remote_server, featureset,