aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-21 21:45:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-22 00:06:37 +0100
commit25bfa2478f1c3a8eb695e1e5760e06db5be8f2fc (patch)
treeed42c94d148ff94a2b172290e6cd1491c4af994e
parent96f8ea07ace1379380fab2d78eb592fa40c867d4 (diff)
downloadbitbake-25bfa2478f1c3a8eb695e1e5760e06db5be8f2fc.tar.gz
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). Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/command.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/bb/command.py b/lib/bb/command.py
index d797fcf93..0cfed0a96 100644
--- a/lib/bb/command.py
+++ b/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