diff options
| author |   Joshua Watt <JPEWhacker@gmail.com> | 2021-05-26 17:09:02 -0500 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-09-24 12:38:18 -1000 |
| commit | 77f62ec8d45cf639d5030d0743778b9bc496a25c (patch) | |
| tree | 0d947f29c7d11f3ce6d5afa3da778552094d528e | |
| parent | 3c1799b2576f80b6dcb310e03f77105a58b9fa8e (diff) | |
| download | bitbake-77f62ec8d45cf639d5030d0743778b9bc496a25c.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: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | lib/bb/server/process.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py index b66fbe0ac..45f2e8631 100644 --- a/lib/bb/server/process.py +++ b/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 |