[oe-commits] [bitbake] 04/19: bb/main.py: fix infinite loop for --server-only

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository bitbake.

commit c4d5c3dab5b35f3c6713efad1c8a23229ce4e56b
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Fri Jul 14 02:58:12 2017 -0700

    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.
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bb/main.py b/lib/bb/main.py
index 1edf56f..84fe904 100755
--- a/lib/bb/main.py
+++ b/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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.