[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6815/8267] bitbake: bb/main.py: fix infinite loop for --server-only

[Emmanuele Bassi <ebassi src gnome org>]

commit 38af7fef512601423c231ae61959b12ec54575cc
Author: Robert Yang <liezhi yang windriver com>
Date:   Fri Jul 14 02:58:12 2017 -0700

    bitbake: bb/main.py: fix infinite loop for --server-only
    
    Fixed:
    $ bitbake --server-only -B localhost:-1
    Infinite loop
    Reconnecting to bitbake server...
    [snip]
    
    Break the loop when server-only can fix the problem.
    
    (Bitbake rev: c4d5c3dab5b35f3c6713efad1c8a23229ce4e56b)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/main.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index 1edf56f..84fe904 100755
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -439,7 +439,7 @@ def setup_bitbake(configParams, configuration, extrafeatures=None, setup_logging
                         raise bb.server.process.ProcessTimeout("Bitbake still shutting down as socket exists 
but no lock?")
                 if not configParams.server_only:
                     server_connection = bb.server.process.connectProcessServer(sockname, featureset)
-                if server_connection:
+                if server_connection or configParams.server_only:
                     break
             except (Exception, bb.server.process.ProcessTimeout) as e:
                 if not retries: