From 798b956360762c1bf9d011d1177356f77f3f6636 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Aug 2014 21:45:52 +0100 Subject: [PATCH] bitbake: command: Trigger updateCache to shut down any active parser threads If we trigger a shutdown whilst parsing for whatever reason, in some cases we were not closing down the parser threads. This change ensures we do so. The function names are not entirely intuitive but the behaviour is more correct (and commented). The previous bug with the stdout failure would trigger this one, if there was a cold cache and parsing was required (but not otherwise). (Bitbake rev: 25bfa2478f1c3a8eb695e1e5760e06db5be8f2fc) Signed-off-by: Richard Purdie --- bitbake/lib/bb/command.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py index d797fcf..0cfed0a 100644 --- a/bitbake/lib/bb/command.py +++ b/bitbake/lib/bb/command.py @@ -87,6 +87,9 @@ class Command: def runAsyncCommand(self): try: if self.cooker.state in (bb.cooker.state.error, bb.cooker.state.shutdown, bb.cooker.state.forceshutdown): + # updateCache will trigger a shutdown of the parser + # and then raise BBHandledException triggering an exit + self.cooker.updateCache() return False if self.currentAsyncCommand is not None: (command, options) = self.currentAsyncCommand -- 2.7.4