diff options
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 10 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/toasterui.py | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 524ba1182c..3295f6c822 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1109,10 +1109,13 @@ class BBCooker: def buildFileIdle(server, rq, abort): + msg = None if abort or self.state == state.forceshutdown: rq.finish_runqueue(True) + msg = "Forced shutdown" elif self.state == state.shutdown: rq.finish_runqueue(False) + msg = "Stopped build" failures = 0 try: retval = rq.execute_runqueue() @@ -1125,7 +1128,7 @@ class BBCooker: if not retval: bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, item, failures), self.event_data) - self.command.finishAsyncCommand() + self.command.finishAsyncCommand(msg) return False if retval is True: return True @@ -1139,10 +1142,13 @@ class BBCooker: """ def buildTargetsIdle(server, rq, abort): + msg = None if abort or self.state == state.forceshutdown: rq.finish_runqueue(True) + msg = "Forced shutdown" elif self.state == state.shutdown: rq.finish_runqueue(False) + msg = "Stopped build" failures = 0 try: retval = rq.execute_runqueue() @@ -1155,7 +1161,7 @@ class BBCooker: if not retval: bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, targets, failures), self.data) - self.command.finishAsyncCommand() + self.command.finishAsyncCommand(msg) return False if retval is True: return True diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py index d2dba256c4..8e30a91109 100644 --- a/bitbake/lib/bb/ui/toasterui.py +++ b/bitbake/lib/bb/ui/toasterui.py @@ -217,6 +217,13 @@ def main(server, eventHandler, params ): if isinstance(event, (bb.command.CommandCompleted, bb.command.CommandFailed, bb.command.CommandExit)): + if (isinstance(event, bb.command.CommandFailed)): + event.levelno = format.ERROR + event.msg = event.error + event.pathname = "" + event.lineno = 0 + buildinfohelper.store_log_event(event) + errors += 1 buildinfohelper.update_build_information(event, errors, warnings, taskfailures) |