From 0ff4529c64a2de45a39b692249b7a8b62c5e9277 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 13 Mar 2013 21:01:51 +0100 Subject: bitbake: runqueue: Use taskData.fn_index[depdata] instead of uninitialized dep * dep variable was removed in commit 3190cb83e2af195a464f669c5aa8aedbf795160e Author: Richard Purdie Date: Wed Jun 27 11:04:06 2012 +0100 taskdata: Add gettask_id_fromfnid helper function This is like gettask_id but doesn't require translation of fnid -> fn first which the function then translates back. This gives a sizeable performance improvement since a significant number of lookups are avoided. * now it fails completely instead of showing which task is missing (Bitbake rev: 58847fabd389e5b8d02d5a9c6827aabedb30312f) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- bitbake/lib/bb/runqueue.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 1bbe7911cd..872bb784d3 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -472,7 +472,7 @@ class RunQueueData: if depdata is not None: taskid = taskData.gettask_id_fromfnid(depdata, idependtask) if taskid is None: - bb.msg.fatal("RunQueue", "Task %s in %s depends upon non-existent task %s in %s" % (taskData.tasks_name[task], fn, idependtask, dep)) + bb.msg.fatal("RunQueue", "Task %s in %s depends upon non-existent task %s in %s" % (taskData.tasks_name[task], fn, idependtask, taskData.fn_index[depdata])) depends.add(taskid) irdepends = taskData.tasks_irdepends[task] for (depid, idependtask) in irdepends: @@ -482,7 +482,7 @@ class RunQueueData: if depdata is not None: taskid = taskData.gettask_id_fromfnid(depdata, idependtask) if taskid is None: - bb.msg.fatal("RunQueue", "Task %s in %s rdepends upon non-existent task %s in %s" % (taskData.tasks_name[task], fn, idependtask, dep)) + bb.msg.fatal("RunQueue", "Task %s in %s rdepends upon non-existent task %s in %s" % (taskData.tasks_name[task], fn, idependtask, taskData.fn_index[depdata])) depends.add(taskid) # Resolve recursive 'recrdeptask' dependencies (Part A) -- cgit v1.2.3-54-g00ecf