[1.50][PATCH 0/1] Pull request

[1.50][PATCH 0/1] Pull request

[Anuj Mittal]

Please merge this change for 1.50/hardknott.

Thanks,

Anuj

The following changes since commit 9b2d96b27f550da0fa68ba9ea96be98eb3a832a6:

  data_smart: Allow colon in variable expansion regex (2021-07-30 14:35:45 +0100)

are available in the Git repository at:

  git://push.openembedded.org/bitbake-contrib stable/1.50-next

Joshua Watt (1):
  server: Fix early parsing errors preventing zombie bitbake

 lib/bb/server/process.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.31.1

[1.50][PATCH 1/1] server: Fix early parsing errors preventing zombie bitbake

[Anuj Mittal]

From: Joshua Watt <JPEWhacker@gmail.com>

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>
---
 lib/bb/server/process.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 
-- 
2.31.1