summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xlib/bb/main.py10
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)