From: Ed Bartosh Date: Wed, 6 Apr 2016 16:46:28 +0000 (+0100) Subject: toasterui: shutdown on BuildCompleted event X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cd60f98b13cf7b1c518851a51e1cbaa596d8f81;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git toasterui: shutdown on BuildCompleted event toasterui exits event loop on one of the following events: CommandCompleted, CommandFailed or CommandExit. Unfortunately none of them come from bitbake when build fails. This is normai if toasterui runs in observer mode. However, if it's in build mode this causes toasterui to stuck in the infinite loop waiting for new events. The only event we can rely on is BuildCompleted as it always comes from bitbake unlike 3 above mentioned events. Modified the code to always shutdown toasterui in build mode on BuildCompleted event. Signed-off-by: Ed Bartosh Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- diff --git a/lib/bb/ui/toasterui.py b/lib/bb/ui/toasterui.py index 39a4fe50058..6bf4c1f0300 100644 --- a/lib/bb/ui/toasterui.py +++ b/lib/bb/ui/toasterui.py @@ -377,11 +377,14 @@ def main(server, eventHandler, params): buildinfohelper.close(errorcode) # we start a new build info - logger.debug("ToasterUI prepared for new build") - errors = 0 - warnings = 0 - taskfailures = [] - buildinfohelper = BuildInfoHelper(server, build_history_enabled) + if params.observe_only: + logger.debug("ToasterUI prepared for new build") + errors = 0 + warnings = 0 + taskfailures = [] + buildinfohelper = BuildInfoHelper(server, build_history_enabled) + else: + main.shutdown = 1 logger.info("ToasterUI build done, brbe: %s", brbe) continue