summaryrefslogtreecommitdiffstats
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 10:19:42 +0100
commitf4526a6e7dbb9ec16ccd579d9746842e14634849 (patch)
tree4a963940425327e6d78d1a13e809a8ffab095213
parent4624b855ed47c5da08953191bfbb39e764ecb343 (diff)
downloadpoky-f4526a6e7dbb9ec16ccd579d9746842e14634849.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: c7b506d11df78cfc4610db6578745eaa6220b13a) 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--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