diff options
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 12 | ||||
| -rw-r--r-- | bitbake/lib/bb/taskdata.py | 10 |
2 files changed, 14 insertions, 8 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 03766adfea..e09e8c8080 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -406,9 +406,8 @@ class RunQueueData: depdata = taskData.build_targets[depid][0] if depdata is None: continue - dep = taskData.fn_index[depdata] for taskname in tasknames: - taskid = taskData.gettask_id(dep, taskname, False) + taskid = taskData.gettask_id_fromfnid(depdata, taskname) if taskid is not None: depends.append(taskid) @@ -419,9 +418,8 @@ class RunQueueData: depdata = taskData.run_targets[depid][0] if depdata is None: continue - dep = taskData.fn_index[depdata] for taskname in tasknames: - taskid = taskData.gettask_id(dep, taskname, False) + taskid = taskData.gettask_id_fromfnid(depdata, taskname) if taskid is not None: depends.append(taskid) @@ -469,8 +467,7 @@ class RunQueueData: # Won't be in build_targets if ASSUME_PROVIDED depdata = taskData.build_targets[depid][0] if depdata is not None: - dep = taskData.fn_index[depdata] - taskid = taskData.gettask_id(dep, idependtask, False) + 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)) depends.append(taskid) @@ -482,8 +479,7 @@ class RunQueueData: # Won't be in run_targets if ASSUME_PROVIDED depdata = taskData.run_targets[depid][0] if depdata is not None: - dep = taskData.fn_index[depdata] - taskid = taskData.gettask_id(dep, idependtask, False) + 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)) depends.append(taskid) diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index 8bc447c11c..55cdde553b 100644 --- a/bitbake/lib/bb/taskdata.py +++ b/bitbake/lib/bb/taskdata.py @@ -116,6 +116,16 @@ class TaskData: ids.append(self.tasks_lookup[fnid][task]) return ids + def gettask_id_fromfnid(self, fnid, task): + """ + Return an ID number for the task matching fnid and task. + """ + if fnid in self.tasks_lookup: + if task in self.tasks_lookup[fnid]: + return self.tasks_lookup[fnid][task] + + return None + def gettask_id(self, fn, task, create = True): """ Return an ID number for the task matching fn and task. |