summaryrefslogtreecommitdiffstats
path: root/lib/bb/main.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/bb/main.py')
-rwxr-xr-xlib/bb/main.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/bb/main.py b/lib/bb/main.py
index 5ca348509..431f6f479 100755
--- a/lib/bb/main.py
+++ b/lib/bb/main.py
@@ -277,7 +277,7 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters):
parser.add_option("-m", "--kill-server", action="store_true",
dest="kill_server", default=False,
- help="Terminate the bitbake server.")
+ help="Terminate any running bitbake server.")
parser.add_option("", "--observe-only", action="store_true",
dest="observe_only", default=False,
@@ -370,8 +370,10 @@ def bitbake_main(configParams, configuration):
server_connection, ui_module = setup_bitbake(configParams, configuration)
# No server connection
if server_connection is None:
- if configParams.status_only or configParams.kill_server:
+ if configParams.status_only:
return 1
+ if configParams.kill_server:
+ return 0
if not configParams.server_only:
if configParams.status_only: