summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-02-28 14:28:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-15 13:18:47 +0000
commit9d9c68e3536387150e3ce7261f4770576e724dd9 (patch)
tree4c52bcf20929fef06594d41e2763a90bee8f8517 /bitbake
parent4c695dbcd12b295a4215422622006f1f58469297 (diff)
downloadpoky-9d9c68e3536387150e3ce7261f4770576e724dd9.tar.gz
poky-9d9c68e3536387150e3ce7261f4770576e724dd9.tar.bz2
poky-9d9c68e3536387150e3ce7261f4770576e724dd9.zip
bitbake/runqueue: show correct task name for setscene task failure
If a setscene task failed previously it was showing an incorrect task name in the error line. This patch ensures we show the correct name, also including the "_setscene" suffix. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/runqueue.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index d7d67fd508..3db083b261 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -204,9 +204,9 @@ class RunQueueData:
ret.extend([nam])
return ret
- def get_user_idstring(self, task):
+ def get_user_idstring(self, task, task_name_suffix = ""):
fn = self.taskData.fn_index[self.runq_fnid[task]]
- taskname = self.runq_task[task]
+ taskname = self.runq_task[task] + task_name_suffix
return "%s, %s" % (fn, taskname)
def get_task_id(self, fnid, taskname):
@@ -1494,7 +1494,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
def task_fail(self, task, result):
self.stats.taskFailed()
index = self.rqdata.runq_setscene[task]
- bb.event.fire(runQueueTaskFailed(task, self.stats, result, self), self.cfgData)
+ bb.event.fire(sceneQueueTaskFailed(index, self.stats, result, self), self.cfgData)
self.scenequeue_notcovered.add(task)
self.scenequeue_updatecounters(task)
@@ -1627,6 +1627,14 @@ class runQueueTaskFailed(runQueueEvent):
runQueueEvent.__init__(self, task, stats, rq)
self.exitcode = exitcode
+class sceneQueueTaskFailed(runQueueTaskFailed):
+ """
+ Event notifing a setscene task failed
+ """
+ def __init__(self, task, stats, exitcode, rq):
+ runQueueTaskFailed.__init__(self, task, stats, exitcode, rq)
+ self.taskstring = rq.rqdata.get_user_idstring(task, "_setscene")
+
class runQueueTaskCompleted(runQueueEvent):
"""
Event notifing a task completed