[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2006/8267] bitbake: toasterui, knotty: don't print taskid followed by taskstring which are now in most cases id

[Emmanuele Bassi <ebassi src gnome org>]

commit 9d0962491c2d7cec2bd53b4cf457e5a0ba73354c
Author: Martin Jansa <martin jansa gmail com>
Date:   Thu Aug 18 17:06:29 2016 +0200

    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>

 bitbake/lib/bb/ui/knotty.py    |   12 ++++++------
 bitbake/lib/bb/ui/toasterui.py |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index b30135b..a1856ec 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):
                     tasktype = 'noexec task'
                 else:
                     tasktype = 'task'
-                logger.info("Running %s %s of %s (ID: %s, %s)",
+                logger.info("Running %s %d of %d (%s)",
                             tasktype,
                             event.stats.completed + event.stats.active +
                                 event.stats.failed + 1,
-                            event.stats.total, event.taskid, event.taskstring)
+                            event.stats.total, event.taskstring)
                 continue
 
             if isinstance(event, bb.runqueue.runQueueTaskFailed):
                 return_value = 1
                 taskfailures.append(event.taskstring)
-                logger.error("Task %s (%s) failed with exit code '%s'",
-                             event.taskid, event.taskstring, event.exitcode)
+                logger.error("Task (%s) failed with exit code '%s'",
+                             event.taskstring, event.exitcode)
                 continue
 
             if isinstance(event, bb.runqueue.sceneQueueTaskFailed):
-                logger.warning("Setscene task %s (%s) failed with exit code '%s' - real task will be run 
instead",
-                               event.taskid, event.taskstring, event.exitcode)
+                logger.warning("Setscene task (%s) failed with exit code '%s' - real task will be run 
instead",
+                               event.taskstring, event.exitcode)
                 continue
 
             if isinstance(event, bb.event.DepTreeGenerated):
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index c9213cc..b5422cf 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -358,8 +358,8 @@ def main(server, eventHandler, params):
             if isinstance(event, bb.runqueue.runQueueTaskFailed):
                 buildinfohelper.update_and_store_task(event)
                 taskfailures.append(event.taskstring)
-                logger.error("Task %s (%s) failed with exit code '%s'",
-                             event.taskid, event.taskstring, event.exitcode)
+                logger.error("Task (%s) failed with exit code '%s'",
+                             event.taskstring, event.exitcode)
                 continue
 
             if isinstance(event, (bb.runqueue.sceneQueueTaskCompleted, bb.runqueue.sceneQueueTaskFailed)):