[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7005/8267] bitbake: main: Always return 0 for bitbake --kill-server

[Emmanuele Bassi <ebassi src gnome org>]

commit e4c9a92cb46bbb61d3ac0e917397eed08cf82410
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Fri Jul 28 16:19:56 2017 +0100

    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>

 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 5ca3485..431f6f4 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: