summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2016-08-18 17:06:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-20 16:08:59 +0100
commit9d0962491c2d7cec2bd53b4cf457e5a0ba73354c (patch)
tree508a9706f1bc651d2ed11a6480f2b8e2e54b8812 /bitbake/lib/bb
parent0b409117c9a7e382ef9167544f79155364e86adb (diff)
downloadpoky-9d0962491c2d7cec2bd53b4cf457e5a0ba73354c.tar.gz
bitbake: toasterui, knotty: don't print taskid followed by taskstring which are now in most cases identical
* unify the format how the task is described * don't show taskid followed by taskstring as the taskstring is different only for setscene tasks (by _setscene suffix) * the duplicated output was introduced by: 2c88afb taskdata/runqueue: Rewrite without use of ID indirection as reported and confirmed as a bug here: http://lists.openembedded.org/pipermail/openembedded-core/2016-June/123148.html * show: NOTE: Running task 541 of 548 (/OE/build/oe-core/openembedded-core/meta/recipes-core/zlib/zlib_1.2.8.bb:do_package) instead of much longer: NOTE: Running task 541 of 548 (ID: /OE/build/oe-core/openembedded-core/meta/recipes-core/zlib/zlib_1.2.8.bb:do_package, /OE/build/oe-core/openembedded-core/meta/recipes-core/zlib/zlib_1.2.8.bb:do_package) and similarly for failed tasks: ERROR: Task (virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-core/zlib/zlib_1.2.8.bb:do_install) failed with exit code '1' instead of much longer: ERROR: Task virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-core/zlib/zlib_1.2.8.bb:do_install (virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-core/zlib/zlib_1.2.8.bb:do_install) failed with exit code '1' (Bitbake rev: 696693d45f5eff1226866ed79dbfb67161d8cd3f) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/ui/knotty.py12
-rw-r--r--bitbake/lib/bb/ui/toasterui.py4
2 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index b30135ba28..a1856ecd77 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -588,23 +588,23 @@ def main(server, eventHandler, params, tf = TerminalFilter):
588 tasktype = 'noexec task' 588 tasktype = 'noexec task'
589 else: 589 else:
590 tasktype = 'task' 590 tasktype = 'task'
591 logger.info("Running %s %s of %s (ID: %s, %s)", 591 logger.info("Running %s %d of %d (%s)",
592 tasktype, 592 tasktype,
593 event.stats.completed + event.stats.active + 593 event.stats.completed + event.stats.active +
594 event.stats.failed + 1, 594 event.stats.failed + 1,
595 event.stats.total, event.taskid, event.taskstring) 595 event.stats.total, event.taskstring)
596 continue 596 continue
597 597
598 if isinstance(event, bb.runqueue.runQueueTaskFailed): 598 if isinstance(event, bb.runqueue.runQueueTaskFailed):
599 return_value = 1 599 return_value = 1
600 taskfailures.append(event.taskstring) 600 taskfailures.append(event.taskstring)
601 logger.error("Task %s (%s) failed with exit code '%s'", 601 logger.error("Task (%s) failed with exit code '%s'",
602 event.taskid, event.taskstring, event.exitcode) 602 event.taskstring, event.exitcode)
603 continue 603 continue
604 604
605 if isinstance(event, bb.runqueue.sceneQueueTaskFailed): 605 if isinstance(event, bb.runqueue.sceneQueueTaskFailed):
606 logger.warning("Setscene task %s (%s) failed with exit code '%s' - real task will be run instead", 606 logger.warning("Setscene task (%s) failed with exit code '%s' - real task will be run instead",
607 event.taskid, event.taskstring, event.exitcode) 607 event.taskstring, event.exitcode)
608 continue 608 continue
609 609
610 if isinstance(event, bb.event.DepTreeGenerated): 610 if isinstance(event, bb.event.DepTreeGenerated):
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index c9213cc89e..b5422cf2b6 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -358,8 +358,8 @@ def main(server, eventHandler, params):
358 if isinstance(event, bb.runqueue.runQueueTaskFailed): 358 if isinstance(event, bb.runqueue.runQueueTaskFailed):
359 buildinfohelper.update_and_store_task(event) 359 buildinfohelper.update_and_store_task(event)
360 taskfailures.append(event.taskstring) 360 taskfailures.append(event.taskstring)
361 logger.error("Task %s (%s) failed with exit code '%s'", 361 logger.error("Task (%s) failed with exit code '%s'",
362 event.taskid, event.taskstring, event.exitcode) 362 event.taskstring, event.exitcode)
363 continue 363 continue
364 364
365 if isinstance(event, (bb.runqueue.sceneQueueTaskCompleted, bb.runqueue.sceneQueueTaskFailed)): 365 if isinstance(event, (bb.runqueue.sceneQueueTaskCompleted, bb.runqueue.sceneQueueTaskFailed)):