diff options
-rwxr-xr-x | bitbake/lib/bb/main.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py index 7711b290de..85d933266b 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, |