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-30 08:43:36 +0100 |
| commit | e4c9a92cb46bbb61d3ac0e917397eed08cf82410 (patch) | |
| tree | 3000716c5b59f6e616108e1840c0d29b9c25f289 /bitbake/lib/bb/main.py | |
| parent | 5f835043f24cef29d229918a9e9cdef62407e558 (diff) | |
| download | openembedded-core-contrib-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>
Diffstat (limited to 'bitbake/lib/bb/main.py')
| -rwxr-xr-x | bitbake/lib/bb/main.py | 6 |
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): 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: |