summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-05-01 16:42:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-08 17:42:05 +0100
commit4b59ba1bbb61fe60f500ad742a6515227b22397d (patch)
tree5fe2ed174a600aa3137e3b1c458dae4ea1238e0b /bitbake/lib/bb/ui
parent7759cd4931b2e7af19eea79dfac6738a92687665 (diff)
downloadpoky-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')
-rw-r--r--bitbake/lib/bb/ui/toasterui.py34
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 ):
236 continue 236 continue
237 237
238 if isinstance(event, (bb.event.BuildCompleted)): 238 if isinstance(event, (bb.event.BuildCompleted)):
239 continue 239 # update the build info helper on BuildCompleted, not on CommandXXX
240
241 if isinstance(event, (bb.command.CommandCompleted,
242 bb.command.CommandFailed,
243 bb.command.CommandExit)):
244 errorcode = 0
245 if (isinstance(event, bb.command.CommandFailed)):
246 event.levelno = format.ERROR
247 event.msg = "Command Failed " + event.error
248 event.pathname = ""
249 event.lineno = 0
250 buildinfohelper.store_log_event(event)
251 errors += 1
252 errorcode = 1
253 logger.error("Command execution failed: %s", event.error)
254
255 buildinfohelper.update_build_information(event, errors, warnings, taskfailures) 240 buildinfohelper.update_build_information(event, errors, warnings, taskfailures)
256 buildinfohelper.close(errorcode) 241 buildinfohelper.close(errorcode)
257 # mark the log output; controllers may kill the toasterUI after seeing this log 242 # mark the log output; controllers may kill the toasterUI after seeing this log
@@ -271,6 +256,23 @@ def main(server, eventHandler, params ):
271 256
272 continue 257 continue
273 258
259 if isinstance(event, (bb.command.CommandCompleted,
260 bb.command.CommandFailed,
261 bb.command.CommandExit)):
262 errorcode = 0
263 if (isinstance(event, bb.command.CommandFailed)):
264 event.levelno = format.ERROR
265 event.msg = "Command Failed " + event.error
266 event.pathname = ""
267 event.lineno = 0
268 buildinfohelper.store_log_event(event)
269 errors += 1
270 errorcode = 1
271 logger.error("Command execution failed: %s", event.error)
272
273
274 continue
275
274 if isinstance(event, bb.event.MetadataEvent): 276 if isinstance(event, bb.event.MetadataEvent):
275 if event.type == "SinglePackageInfo": 277 if event.type == "SinglePackageInfo":
276 buildinfohelper.store_build_package_information(event) 278 buildinfohelper.store_build_package_information(event)