summaryrefslogtreecommitdiffstats
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-23 09:31:42 +0100
commitecf72a71320582cf8cd2d398c3653f432effb35d (patch)
tree20895dc6ba70af7de810239e453e9588b12c54d6
parentc501492132d47aef13414b5851e7eb56fda607cd (diff)
downloadpoky-ecf72a71320582cf8cd2d398c3653f432effb35d.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/command.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index d797fcf930..0cfed0a969 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -87,6 +87,9 @@ class Command:
87 def runAsyncCommand(self): 87 def runAsyncCommand(self):
88 try: 88 try:
89 if self.cooker.state in (bb.cooker.state.error, bb.cooker.state.shutdown, bb.cooker.state.forceshutdown): 89 if self.cooker.state in (bb.cooker.state.error, bb.cooker.state.shutdown, bb.cooker.state.forceshutdown):
90 # updateCache will trigger a shutdown of the parser
91 # and then raise BBHandledException triggering an exit
92 self.cooker.updateCache()
90 return False 93 return False
91 if self.currentAsyncCommand is not None: 94 if self.currentAsyncCommand is not None:
92 (command, options) = self.currentAsyncCommand 95 (command, options) = self.currentAsyncCommand