Skip to contentSkip to conversation

Restore tasks summary in the error case

PATCH Applied Paul Eggleton 2 participants 3 messages Jan 19, 2012 – Jan 20, 2012

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Restore tasks summary in the error case

A patch to make the "tasks summary" line always log rather than only when everything succeeds.

Thanks to Martin Jansa for reminding me about this one.

The patch (against Poky, but applies cleanly with -p2 against bitbake master) is available in the git repository at:
git://git.yoctoproject.org/poky-contrib paule/tasksummary
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/tasksummary

Paul Eggleton (1):
bitbake/runqueue: always log tasks summary

 bitbake/lib/bb/runqueue.py |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/1 bitbake/runqueue: always log tasks summary

It's unclear from the history but at some point we stopped logging the "Tasks Summary" NOTE when tasks failed. Reinstate this for failure, and also make the count of attempted tasks include the failed task.

Signed-off-by Paul Eggleton <[email protected]>
---
 bitbake/lib/bb/runqueue.py |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
bitbake/lib/bb/runqueue.py +7 -5
index 054d36c..be6bbb1 100644
@@ -959,6 +959,13 @@ class RunQueue:
         if self.state is runQueueCleanUp:
            self.rqexe.finish()
 
+        if self.state is runQueueComplete or self.state is runQueueFailed:
+            if self.rqexe.stats.failed:
+                logger.info("Tasks Summary: Attempted %d tasks of which %d didn't need to be rerun and %d failed.", self.rqexe.stats.completed + self.rqexe.stats.failed, self.rqexe.stats.skipped, self.rqexe.stats.failed)
+            else:
+                # Let's avoid the word "failed" if nothing actually did
+                logger.info("Tasks Summary: Attempted %d tasks of which %d didn't need to be rerun and all succeeded.", self.rqexe.stats.completed, self.rqexe.stats.skipped)
+
         if self.state is runQueueFailed:
             if not self.rqdata.taskData.tryaltconfigs:
                 raise bb.runqueue.TaskFailure(self.rqexe.failed_fnids)

@@ -968,11 +975,6 @@ class RunQueue:
 
         if self.state is runQueueComplete:
             # All done
-            if self.rqexe.stats.failed:
-                logger.info("Tasks Summary: Attempted %d tasks of which %d didn't need to be rerun and %d failed.", self.rqexe.stats.completed, self.rqexe.stats.skipped, self.rqexe.stats.failed)
-            else:
-                # Let's avoid the word "failed" if nothing actually did
-                logger.info("Tasks Summary: Attempted %d tasks of which %d didn't need to be rerun and all succeeded.", self.rqexe.stats.completed, self.rqexe.stats.skipped)
             return False
 
         if self.state is runQueueChildProcess:
Signature · 1 line
1.7.5.4
Applied
#2 lore raw

Re: [PATCH 1/1] bitbake/runqueue: always log tasks summary

Quoted 8 lines · Paul Eggleton

It's unclear from the history but at some point we stopped logging the "Tasks Summary" NOTE when tasks failed. Reinstate this for failure, and also make the count of attempted tasks include the failed task.

Signed-off-by Paul Eggleton <[email protected]>
---
 bitbake/lib/bb/runqueue.py |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

Merged to master, thanks.

Richard