diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-28 16:19:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-28 23:02:32 +0100 |
commit | 0f85c54385f325f3ebbf911b35bbac11b8863b6b (patch) | |
tree | ba7c9145073e40ceedfdac58098ef27c1df1af71 | |
parent | 8633b7cd03cfaba3e0359aa5da22fc76b66768c7 (diff) | |
download | bitbake-contrib-0f85c54385f325f3ebbf911b35bbac11b8863b6b.tar.gz |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | lib/bb/main.py | 6 |
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: |