summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-28 16:19:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-30 08:43:36 +0100
commite4c9a92cb46bbb61d3ac0e917397eed08cf82410 (patch)
tree3000716c5b59f6e616108e1840c0d29b9c25f289
parent5f835043f24cef29d229918a9e9cdef62407e558 (diff)
downloadpoky-e4c9a92cb46bbb61d3ac0e917397eed08cf82410.tar.gz
bitbake: main: Always return 0 for bitbake --kill-server
If the server isn't running return 0 as to do otherwise complicates scripts which do cleanup of bitbake servers which would potentially be memory resident. (Bitbake rev: 0f85c54385f325f3ebbf911b35bbac11b8863b6b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/main.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index 5ca3485096..431f6f4794 100755
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -277,7 +277,7 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters):
277 277
278 parser.add_option("-m", "--kill-server", action="store_true", 278 parser.add_option("-m", "--kill-server", action="store_true",
279 dest="kill_server", default=False, 279 dest="kill_server", default=False,
280 help="Terminate the bitbake server.") 280 help="Terminate any running bitbake server.")
281 281
282 parser.add_option("", "--observe-only", action="store_true", 282 parser.add_option("", "--observe-only", action="store_true",
283 dest="observe_only", default=False, 283 dest="observe_only", default=False,
@@ -370,8 +370,10 @@ def bitbake_main(configParams, configuration):
370 server_connection, ui_module = setup_bitbake(configParams, configuration) 370 server_connection, ui_module = setup_bitbake(configParams, configuration)
371 # No server connection 371 # No server connection
372 if server_connection is None: 372 if server_connection is None:
373 if configParams.status_only or configParams.kill_server: 373 if configParams.status_only:
374 return 1 374 return 1
375 if configParams.kill_server:
376 return 0
375 377
376 if not configParams.server_only: 378 if not configParams.server_only:
377 if configParams.status_only: 379 if configParams.status_only: