From 14fb92c008ae01692a943c1d035b790101aeb2af Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 30 Oct 2007 12:03:07 +0000 Subject: bitbake runqueue.py: Allow multiple options for deptask flag (from poky), fix comment typo. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3041 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake/lib/bb/runqueue.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index f245fd6c1..2f80dd4c8 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -109,14 +109,15 @@ class RunQueue: # Resolve Depends if 'deptask' in task_deps and taskData.tasks_name[task] in task_deps['deptask']: - taskname = task_deps['deptask'][taskData.tasks_name[task]] + tasknames = task_deps['deptask'][taskData.tasks_name[task]].split() for depid in taskData.depids[fnid]: # Won't be in build_targets if ASSUME_PROVIDED if depid in taskData.build_targets: depdata = taskData.build_targets[depid][0] if depdata is not None: dep = taskData.fn_index[depdata] - depends.append(taskData.gettask_id(dep, taskname)) + for taskname in tasknames: + depends.append(taskData.gettask_id(dep, taskname)) # Resolve Runtime Depends if 'rdeptask' in task_deps and taskData.tasks_name[task] in task_deps['rdeptask']: @@ -375,7 +376,7 @@ class RunQueue: bb.msg.fatal(bb.msg.domain.RunQueue, "Task %s (%s) count not zero!" % (task, self.get_user_idstring(task))) - # Check for mulitple taska building the same provider + # Check for multiple tasks building the same provider prov_list = {} seen_fn = [] for task in range(len(self.runq_fnid)): -- cgit v1.2.3