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):
                    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'",
+                logger.error("Task (%s) failed with exit code '%s'",
-                             event.taskid, event.taskstring, event.exitcode)
+                             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",
+                logger.warning("Setscene task (%s) failed with exit code '%s' - real task will be run instead",
-                               event.taskid, event.taskstring, event.exitcode)
+                               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 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):
            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'",
+                logger.error("Task (%s) failed with exit code '%s'",
-                             event.taskid, event.taskstring, event.exitcode)
+                             event.taskstring, event.exitcode)
                continue
            if isinstance(event, (bb.runqueue.sceneQueueTaskCompleted, bb.runqueue.sceneQueueTaskFailed)):

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)):