From 75f491e5e20bd0aade764ea5bd15f547fafb7684 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Wed, 26 May 2021 17:09:02 -0500 Subject: bitbake: server: Fix early parsing errors preventing zombie bitbake If the client process never sends cooker data, the server timeout will be 0.0, not None. This will prevent the server from exiting, as it is waiting for a new client. In particular, the client will disconnect with a bad "INHERIT" line, such as: INHERIT += "this-class-does-not-exist" Instead of checking explicitly for None, check for a false value, which means either 0.0 or None. (Bitbake rev: 13e2855bff6a6ead6dbd33c5be4b988aafcd4afa) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bitbake/lib/bb/server/process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitbake/lib/bb/server') diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index 155e8d131f..a0955722e3 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py @@ -147,7 +147,7 @@ class ProcessServer(): conn = newconnections.pop(-1) fds.append(conn) self.controllersock = conn - elif self.timeout is None and not ready: + elif not self.timeout and not ready: serverlog("No timeout, exiting.") self.quit = True -- cgit v1.2.3-54-g00ecf