summaryrefslogtreecommitdiffstats
path: root/lib/bb/cooker.py
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-03-30 15:54:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-30 21:21:55 +0100
commit7ebea3e9a60232222efa8a546a0ff28a53029949 (patch)
tree5dbab2edb3ac89e6cf8b7d50bf0d2911d7a4b0a3 /lib/bb/cooker.py
parent3f8febc4212fbd3485ac9bdd4ac71b8fb0a05693 (diff)
downloadbitbake-contrib-7ebea3e9a60232222efa8a546a0ff28a53029949.tar.gz
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>
Diffstat (limited to 'lib/bb/cooker.py')
-rw-r--r--lib/bb/cooker.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 771932a82..3747e0890 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')