diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-07-17 01:27:14 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-21 07:20:14 +0100 |
commit | 335fd0106359dddfe1eeb0c7d0bc03f8454b895c (patch) | |
tree | b64585555216541876872e47652684f8fe84b23e | |
parent | c4d5c3dab5b35f3c6713efad1c8a23229ce4e56b (diff) | |
download | bitbake-contrib-335fd0106359dddfe1eeb0c7d0bc03f8454b895c.tar.gz |
bb/main.py: avoid starting server when not needed
Fixed 1:
$ . ../poky/oe-init-build-env-memres .
$ bitbake -m
$ bitbake -m # shutdown it again
$ bitbake -m
Starting bitbake server...
Terminated bitbake server.
It starts the server and kill it which is redundant.
$ bitbake -m
$ bitbake --status-only
Starting bitbake server...
It starts the server which is not what we need.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | lib/bb/main.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/bb/main.py b/lib/bb/main.py index 84fe904ef..b09513f46 100755 --- a/lib/bb/main.py +++ b/lib/bb/main.py @@ -368,8 +368,10 @@ def bitbake_main(configParams, configuration): configuration.debug_domains) server_connection, ui_module = setup_bitbake(configParams, configuration) - if server_connection is None and configParams.kill_server: - return 0 + # No server connection + if server_connection is None: + if configParams.status_only or configParams.kill_server: + return 1 if not configParams.server_only: if configParams.status_only: @@ -426,6 +428,10 @@ def setup_bitbake(configParams, configuration, extrafeatures=None, setup_logging topdir, lock = lockBitbake() sockname = topdir + "/bitbake.sock" if lock: + if configParams.status_only or configParams.kill_server: + logger.info("bitbake server is not running.") + lock.close() + return None, None # we start a server with a given configuration logger.info("Starting bitbake server...") server = bb.server.process.BitBakeServer(lock, sockname, configuration, featureset) |