diff options
| author |   Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-05-01 16:42:39 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-08 17:42:05 +0100 |
| commit | 4b59ba1bbb61fe60f500ad742a6515227b22397d (patch) | |
| tree | 5fe2ed174a600aa3137e3b1c458dae4ea1238e0b /bitbake/lib/bb/ui/toasterui.py | |
| parent | 7759cd4931b2e7af19eea79dfac6738a92687665 (diff) | |
| download | openembedded-core-contrib-4b59ba1bbb61fe60f500ad742a6515227b22397d.tar.gz | |
bitbake: toasterui: close build on BuildCompleted event
Moving the code to close the build and instantiate a fresh
buildinfohelper object to BuildCompleted event, as the
CommandCompleted/Failed/Exit events come in too early.
(Bitbake rev: af63abe88327fd5c1b3d7c00a84d9e408ef23285)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/toasterui.py')
| -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) |