[oe-commits] [bitbake] 01/04: cooker: fix CookerParser.shutdown()

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 7ebea3e9a60232222efa8a546a0ff28a53029949
Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
AuthorDate: Wed Mar 30 15:54:00 2016 +0300

    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 at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cooker.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 771932a..3747e08 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')

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.