diff options
Diffstat (limited to 'bitbake/lib/bb/main.py')
-rwxr-xr-x | bitbake/lib/bb/main.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py index dd0439391e..c0ae38ab6d 100755 --- a/bitbake/lib/bb/main.py +++ b/bitbake/lib/bb/main.py | |||
@@ -403,10 +403,16 @@ def bitbake_main(configParams, configuration): | |||
403 | if not configParams.server_only: | 403 | if not configParams.server_only: |
404 | try: | 404 | try: |
405 | server_connection = server.establishConnection(featureset) | 405 | server_connection = server.establishConnection(featureset) |
406 | server_connection.setupEventQueue() | ||
407 | except Exception as e: | 406 | except Exception as e: |
408 | bb.fatal("Could not connect to server %s: %s" % (configParams.remote_server, str(e))) | 407 | bb.fatal("Could not connect to server %s: %s" % (configParams.remote_server, str(e))) |
409 | 408 | ||
409 | if configParams.kill_server: | ||
410 | server_connection.connection.terminateServer() | ||
411 | bb.event.ui_queue = [] | ||
412 | return 0 | ||
413 | |||
414 | server_connection.setupEventQueue() | ||
415 | |||
410 | # Restore the environment in case the UI needs it | 416 | # Restore the environment in case the UI needs it |
411 | for k in cleanedvars: | 417 | for k in cleanedvars: |
412 | os.environ[k] = cleanedvars[k] | 418 | os.environ[k] = cleanedvars[k] |
@@ -418,11 +424,6 @@ def bitbake_main(configParams, configuration): | |||
418 | server_connection.terminate() | 424 | server_connection.terminate() |
419 | return 0 | 425 | return 0 |
420 | 426 | ||
421 | if configParams.kill_server: | ||
422 | server_connection.connection.terminateServer() | ||
423 | bb.event.ui_queue = [] | ||
424 | return 0 | ||
425 | |||
426 | try: | 427 | try: |
427 | return ui_module.main(server_connection.connection, server_connection.events, configParams) | 428 | return ui_module.main(server_connection.connection, server_connection.events, configParams) |
428 | finally: | 429 | finally: |