summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2021-05-26 17:09:02 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-02 09:55:51 +0100
commit93efbb5548eedc980980b1ebffdeddd989cd6a57 (patch)
treeaa9c1919be183baba7b3803c19199340db9cf29d
parentc0278562919cc79eec97f17b156811e64747e4f2 (diff)
downloadpoky-93efbb5548eedc980980b1ebffdeddd989cd6a57.tar.gz
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 <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 13e2855bff6a6ead6dbd33c5be4b988aafcd4afa) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/server/process.py3
1 files changed, 2 insertions, 1 deletions
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):
152 conn = newconnections.pop(-1) 152 conn = newconnections.pop(-1)
153 fds.append(conn) 153 fds.append(conn)
154 self.controllersock = conn 154 self.controllersock = conn
155 elif self.timeout is None and not ready: 155
156 elif not self.timeout and not ready:
156 print("No timeout, exiting.") 157 print("No timeout, exiting.")
157 self.quit = True 158 self.quit = True
158 159