From patchwork Thu Mar 1 14:57:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 3/3] bitbake/build: report TaskFailedSilent events as "Failed" Date: Thu, 01 Mar 2012 14:57:37 -0000 From: Paul Eggleton X-Patchwork-Id: 22543 Message-Id: To: bitbake-devel@lists.openembedded.org The change for setscene events to fire a TaskFailedSilent event instead of TaskFailed resulted in "FailedSilent" being reported in the task finish note log entry, which is not really desirable, so change it back to reporting "Failed" again. Signed-off-by: Paul Eggleton --- bitbake/lib/bb/build.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index e390bec..a9b40e7 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -72,7 +72,7 @@ class TaskBase(event.Event): self._task = t self._package = d.getVar("PF", 1) event.Event.__init__(self) - self._message = "package %s: task %s: %s" % (d.getVar("PF", 1), t, bb.event.getName(self)[4:]) + self._message = "package %s: task %s: %s" % (d.getVar("PF", 1), t, self.getDisplayName()) def getTask(self): return self._task @@ -80,6 +80,9 @@ class TaskBase(event.Event): def setTask(self, task): self._task = task + def getDisplayName(self): + return bb.event.getName(self)[4:] + task = property(getTask, setTask, None, "task property") class TaskStarted(TaskBase): @@ -102,6 +105,10 @@ class TaskFailedSilent(TaskBase): self.logfile = logfile super(TaskFailedSilent, self).__init__(task, metadata) + def getDisplayName(self): + # Don't need to tell the user it was silent + return "Failed" + class TaskInvalid(TaskBase): def __init__(self, task, metadata):