From 9d9c68e3536387150e3ce7261f4770576e724dd9 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 28 Feb 2011 14:28:25 +0000 Subject: 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 --- bitbake/lib/bb/runqueue.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'bitbake') 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 -- cgit 1.2.3-korg