sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: command/runqueue: Fix shutdown logic 

If you hit Ctrl+C at the right point, the system processes the request
but merrily continues building. It turns out finish_runqueue() is called
but this doesn't stop the later generation and execution of the
runqueue.

This patch adjusts some of the conditionals to ensure the build really
does stop.

(Bitbake rev: 39b08c604ba713100e174c136f81f18eca6ef33d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2014-07-21 09:35:53 +01:00
parent 4db62dff9f
commit 13a03f2e9c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitbake/lib/bb/command.py
View File

@ -86,7 +86,7 @@ class Command:
def runAsyncCommand(self):
try:
if self.cooker.state == bb.cooker.state.error:
if self.cooker.state in (bb.cooker.state.error, bb.cooker.state.shutdown, bb.cooker.state.forceshutdown):
return False
if self.currentAsyncCommand is not None:
(command, options) = self.currentAsyncCommand

3
bitbake/lib/bb/runqueue.py
View File

@ -1065,7 +1065,7 @@ class RunQueue:
if self.state is runQueueCleanUp:
self.rqexe.finish()
if self.state is runQueueComplete or self.state is runQueueFailed:
if (self.state is runQueueComplete or self.state is runQueueFailed) and self.rqexe:
self.teardown_workers()
if self.rqexe.stats.failed:
logger.info("Tasks Summary: Attempted %d tasks of which %d didn't need to be rerun and %d failed.", self.rqexe.stats.completed + self.rqexe.stats.failed, self.rqexe.stats.skipped, self.rqexe.stats.failed)
@ -1106,6 +1106,7 @@ class RunQueue:
def finish_runqueue(self, now = False):
if not self.rqexe:
self.state = runQueueComplete
return
if now: