diff options
| -rw-r--r-- | bitbake/lib/bb/ui/toasterui.py | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py index 6a7a1cd174..30540483c3 100644 --- a/bitbake/lib/bb/ui/toasterui.py +++ b/bitbake/lib/bb/ui/toasterui.py @@ -236,22 +236,7 @@ def main(server, eventHandler, params ): continue if isinstance(event, (bb.event.BuildCompleted)): - continue - - if isinstance(event, (bb.command.CommandCompleted, - bb.command.CommandFailed, - bb.command.CommandExit)): - errorcode = 0 - if (isinstance(event, bb.command.CommandFailed)): - event.levelno = format.ERROR - event.msg = "Command Failed " + event.error - event.pathname = "" - event.lineno = 0 - buildinfohelper.store_log_event(event) - errors += 1 - errorcode = 1 - logger.error("Command execution failed: %s", event.error) - + # update the build info helper on BuildCompleted, not on CommandXXX buildinfohelper.update_build_information(event, errors, warnings, taskfailures) buildinfohelper.close(errorcode) # mark the log output; controllers may kill the toasterUI after seeing this log @@ -271,6 +256,23 @@ def main(server, eventHandler, params ): continue + if isinstance(event, (bb.command.CommandCompleted, + bb.command.CommandFailed, + bb.command.CommandExit)): + errorcode = 0 + if (isinstance(event, bb.command.CommandFailed)): + event.levelno = format.ERROR + event.msg = "Command Failed " + event.error + event.pathname = "" + event.lineno = 0 + buildinfohelper.store_log_event(event) + errors += 1 + errorcode = 1 + logger.error("Command execution failed: %s", event.error) + + + continue + if isinstance(event, bb.event.MetadataEvent): if event.type == "SinglePackageInfo": buildinfohelper.store_build_package_information(event) |