From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Wed, 30 Mar 2016 12:54:00 +0000 (+0300)
Subject: cooker: fix CookerParser.shutdown()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ebea3e9a60232222efa8a546a0ff28a53029949;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

cooker: fix CookerParser.shutdown()

Prevent a hang when shutdown() is called during parsing (e.g. after
SIGINT). We must not append 'None' to the jobs queue. Otherwise the
worker loop inside Parser.realrun() may break out at the wrong point,
causing the results queue thread blocking bitbake indefinitely.

[YOCTO #9319]

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 771932a82d3..3747e0890b5 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -2064,7 +2064,6 @@ class CookerParser(object):
             bb.event.fire(event, self.cfgdata)
             self.feeder_quit.put(None)
             for process in self.processes:
-                self.jobs.put(None)
                 self.parser_quit.put(None)
         else:
             self.feeder_quit.put('cancel')