From 93efbb5548eedc980980b1ebffdeddd989cd6a57 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Wed, 26 May 2021 17:09:02 -0500 Subject: [PATCH] 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: 77f62ec8d45cf639d5030d0743778b9bc496a25c) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie (cherry picked from commit 13e2855bff6a6ead6dbd33c5be4b988aafcd4afa) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- bitbake/lib/bb/server/process.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index b66fbe0acd..45f2e86319 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py @@ -152,7 +152,8 @@ class ProcessServer(multiprocessing.Process): 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: print("No timeout, exiting.") self.quit = True