aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2021-09-09 09:25:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-09 09:41:51 +0100
commitc7b506d11df78cfc4610db6578745eaa6220b13a (patch)
treee4a070bb98df3fe271c9f481442dddff7904ebee
parent9b2d96b27f550da0fa68ba9ea96be98eb3a832a6 (diff)
downloadbitbake-contrib-c7b506d11df78cfc4610db6578745eaa6220b13a.tar.gz
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. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 13e2855bff6a6ead6dbd33c5be4b988aafcd4afa) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/server/process.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py
index 155e8d131..a0955722e 100644
--- a/lib/bb/server/process.py
+++ b/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