From da5236cf0789c2efa74e6f9d0e13552c1fa915cd Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 1 Mar 2012 14:57:37 +0000 Subject: bitbake/build: report TaskFailedSilent events as "Failed" 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. (Bitbake rev: 224bc74d4e901b7886b845fbb3b5fe7564a2f6cb) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/build.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index e390bec51f..a9b40e729d 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): -- cgit v1.2.3-54-g00ecf