summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/build.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-01 14:57:37 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-01 15:51:36 +0000
commitda5236cf0789c2efa74e6f9d0e13552c1fa915cd (patch)
tree4df6440e553427d6c48703e2929d980beee7bace /bitbake/lib/bb/build.py
parentdb4a1999437a4b76fa2cae4fcaadb67471bc828e (diff)
downloadpoky-da5236cf0789c2efa74e6f9d0e13552c1fa915cd.tar.gz
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 <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/build.py')
-rw-r--r--bitbake/lib/bb/build.py9
1 files changed, 8 insertions, 1 deletions
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):
72 self._task = t 72 self._task = t
73 self._package = d.getVar("PF", 1) 73 self._package = d.getVar("PF", 1)
74 event.Event.__init__(self) 74 event.Event.__init__(self)
75 self._message = "package %s: task %s: %s" % (d.getVar("PF", 1), t, bb.event.getName(self)[4:]) 75 self._message = "package %s: task %s: %s" % (d.getVar("PF", 1), t, self.getDisplayName())
76 76
77 def getTask(self): 77 def getTask(self):
78 return self._task 78 return self._task
@@ -80,6 +80,9 @@ class TaskBase(event.Event):
80 def setTask(self, task): 80 def setTask(self, task):
81 self._task = task 81 self._task = task
82 82
83 def getDisplayName(self):
84 return bb.event.getName(self)[4:]
85
83 task = property(getTask, setTask, None, "task property") 86 task = property(getTask, setTask, None, "task property")
84 87
85class TaskStarted(TaskBase): 88class TaskStarted(TaskBase):
@@ -102,6 +105,10 @@ class TaskFailedSilent(TaskBase):
102 self.logfile = logfile 105 self.logfile = logfile
103 super(TaskFailedSilent, self).__init__(task, metadata) 106 super(TaskFailedSilent, self).__init__(task, metadata)
104 107
108 def getDisplayName(self):
109 # Don't need to tell the user it was silent
110 return "Failed"
111
105class TaskInvalid(TaskBase): 112class TaskInvalid(TaskBase):
106 113
107 def __init__(self, task, metadata): 114 def __init__(self, task, metadata):