diff options
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-x | bitbake/bin/bitbake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index 89289050de..40b50e1688 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake | |||
@@ -229,10 +229,8 @@ Default BBFILES are the .bb files in the current directory.""") | |||
229 | # Before we start modifying the environment we should take a pristine | 229 | # Before we start modifying the environment we should take a pristine |
230 | # copy for possible later use | 230 | # copy for possible later use |
231 | initialenv = os.environ.copy() | 231 | initialenv = os.environ.copy() |
232 | # Clear away any spurious environment variables. But don't wipe the | 232 | # Clear away any spurious environment variables while we stoke up the cooker |
233 | # environment totally. This is necessary to ensure the correct operation | 233 | cleanedvars = bb.utils.clean_environment() |
234 | # of the UIs (e.g. for DISPLAY, etc.) | ||
235 | bb.utils.clean_environment() | ||
236 | 234 | ||
237 | server = server.BitBakeServer() | 235 | server = server.BitBakeServer() |
238 | if configuration.bind: | 236 | if configuration.bind: |
@@ -258,6 +256,10 @@ Default BBFILES are the .bb files in the current directory.""") | |||
258 | # Setup a connection to the server (cooker) | 256 | # Setup a connection to the server (cooker) |
259 | server_connection = server.establishConnection() | 257 | server_connection = server.establishConnection() |
260 | 258 | ||
259 | # Restore the environment in case the UI needs it | ||
260 | for k in cleanedvars: | ||
261 | os.environ[k] = cleanedvars[k] | ||
262 | |||
261 | try: | 263 | try: |
262 | return server.launchUI(ui_main, server_connection.connection, server_connection.events) | 264 | return server.launchUI(ui_main, server_connection.connection, server_connection.events) |
263 | finally: | 265 | finally: |