summaryrefslogtreecommitdiffstats
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-31 09:13:04 +0100
commit2554be49f2993c8cc3c10d9d1896c9bef530b0f1 (patch)
tree856309aab657e97e3887a513dcdf71886a3a2087
parent53b5dc0dda3fa7703e8f6a68b05b565ecee9e41f (diff)
downloadpoky-2554be49f2993c8cc3c10d9d1896c9bef530b0f1.tar.gz
bitbake: 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] (Bitbake rev: 7ebea3e9a60232222efa8a546a0ff28a53029949) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 771932a82d..3747e0890b 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -2064,7 +2064,6 @@ class CookerParser(object):
2064 bb.event.fire(event, self.cfgdata) 2064 bb.event.fire(event, self.cfgdata)
2065 self.feeder_quit.put(None) 2065 self.feeder_quit.put(None)
2066 for process in self.processes: 2066 for process in self.processes:
2067 self.jobs.put(None)
2068 self.parser_quit.put(None) 2067 self.parser_quit.put(None)
2069 else: 2068 else:
2070 self.feeder_quit.put('cancel') 2069 self.feeder_quit.put('cancel')