From 2554be49f2993c8cc3c10d9d1896c9bef530b0f1 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 30 Mar 2016 15:54:00 +0300 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 1 - 1 file changed, 1 deletion(-) 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): 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') -- cgit 1.2.3-korg