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-07-20 19:00:32 +0100
commit75f491e5e20bd0aade764ea5bd15f547fafb7684 (patch)
tree60a429e25aa85b64595af1fb74a3c7c1e2880f31
parentb635fce91d9877e70f16e467c41f9a360fa1b21d (diff)
downloadpoky-75f491e5e20bd0aade764ea5bd15f547fafb7684.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: 13e2855bff6a6ead6dbd33c5be4b988aafcd4afa) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/server/process.py2
1 files changed, 1 insertions, 1 deletions
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():
147 conn = newconnections.pop(-1) 147 conn = newconnections.pop(-1)
148 fds.append(conn) 148 fds.append(conn)
149 self.controllersock = conn 149 self.controllersock = conn
150 elif self.timeout is None and not ready: 150 elif not self.timeout and not ready:
151 serverlog("No timeout, exiting.") 151 serverlog("No timeout, exiting.")
152 self.quit = True 152 self.quit = True
153 153