diff options
author | Richard Purdie <richard@openedhand.com> | 2007-08-16 09:55:21 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-08-16 09:55:21 +0000 |
commit | 7611768e23d9809f458691454c2aeb60d7b26e7d (patch) | |
tree | 050786d6475e1d0ed219d01dac1f02b1ebbdbb81 /bitbake/lib/bb/runqueue.py | |
parent | 11ce59b501b5c82f6705db4d76e468fcbe3412db (diff) | |
download | poky-7611768e23d9809f458691454c2aeb60d7b26e7d.tar.gz |
bitbake: Sync with 1.8 head. Adds locking to the fetcher to prevent parallel downloads, fixes key expansion issues and occasional missing dependency graph links
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2502 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 21383f4206..c55a58da2b 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -22,7 +22,7 @@ Handles preparation and execution of a queue of tasks | |||
22 | # with this program; if not, write to the Free Software Foundation, Inc., | 22 | # with this program; if not, write to the Free Software Foundation, Inc., |
23 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 23 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
24 | 24 | ||
25 | from bb import msg, data, fetch, event, mkdirhier, utils | 25 | from bb import msg, data, event, mkdirhier, utils |
26 | from sets import Set | 26 | from sets import Set |
27 | import bb, os, sys | 27 | import bb, os, sys |
28 | import signal | 28 | import signal |
@@ -113,7 +113,7 @@ class RunQueue: | |||
113 | # Won't be in build_targets if ASSUME_PROVIDED | 113 | # Won't be in build_targets if ASSUME_PROVIDED |
114 | if depid in taskData.build_targets: | 114 | if depid in taskData.build_targets: |
115 | depdata = taskData.build_targets[depid][0] | 115 | depdata = taskData.build_targets[depid][0] |
116 | if depdata: | 116 | if depdata is not None: |
117 | dep = taskData.fn_index[depdata] | 117 | dep = taskData.fn_index[depdata] |
118 | depends.append(taskData.gettask_id(dep, taskname)) | 118 | depends.append(taskData.gettask_id(dep, taskname)) |
119 | 119 | ||
@@ -123,7 +123,7 @@ class RunQueue: | |||
123 | for depid in taskData.rdepids[fnid]: | 123 | for depid in taskData.rdepids[fnid]: |
124 | if depid in taskData.run_targets: | 124 | if depid in taskData.run_targets: |
125 | depdata = taskData.run_targets[depid][0] | 125 | depdata = taskData.run_targets[depid][0] |
126 | if depdata: | 126 | if depdata is not None: |
127 | dep = taskData.fn_index[depdata] | 127 | dep = taskData.fn_index[depdata] |
128 | depends.append(taskData.gettask_id(dep, taskname)) | 128 | depends.append(taskData.gettask_id(dep, taskname)) |
129 | 129 | ||
@@ -133,7 +133,7 @@ class RunQueue: | |||
133 | if depid in taskData.build_targets: | 133 | if depid in taskData.build_targets: |
134 | # Won't be in build_targets if ASSUME_PROVIDED | 134 | # Won't be in build_targets if ASSUME_PROVIDED |
135 | depdata = taskData.build_targets[depid][0] | 135 | depdata = taskData.build_targets[depid][0] |
136 | if depdata: | 136 | if depdata is not None: |
137 | dep = taskData.fn_index[depdata] | 137 | dep = taskData.fn_index[depdata] |
138 | depends.append(taskData.gettask_id(dep, idepend.split(":")[1])) | 138 | depends.append(taskData.gettask_id(dep, idepend.split(":")[1])) |
139 | 139 | ||
@@ -148,11 +148,11 @@ class RunQueue: | |||
148 | dep_seen.append(depid) | 148 | dep_seen.append(depid) |
149 | if depid in taskData.build_targets: | 149 | if depid in taskData.build_targets: |
150 | depdata = taskData.build_targets[depid][0] | 150 | depdata = taskData.build_targets[depid][0] |
151 | if depdata: | 151 | if depdata is not None: |
152 | dep = taskData.fn_index[depdata] | 152 | dep = taskData.fn_index[depdata] |
153 | # Need to avoid creating new tasks here | 153 | # Need to avoid creating new tasks here |
154 | taskid = taskData.gettask_id(dep, taskname, False) | 154 | taskid = taskData.gettask_id(dep, taskname, False) |
155 | if taskid: | 155 | if taskid is not None: |
156 | depends.append(taskid) | 156 | depends.append(taskid) |
157 | fnid = taskData.tasks_fnid[taskid] | 157 | fnid = taskData.tasks_fnid[taskid] |
158 | else: | 158 | else: |
@@ -180,11 +180,11 @@ class RunQueue: | |||
180 | rdep_seen.append(rdepid) | 180 | rdep_seen.append(rdepid) |
181 | if rdepid in taskData.run_targets: | 181 | if rdepid in taskData.run_targets: |
182 | depdata = taskData.run_targets[rdepid][0] | 182 | depdata = taskData.run_targets[rdepid][0] |
183 | if depdata: | 183 | if depdata is not None: |
184 | dep = taskData.fn_index[depdata] | 184 | dep = taskData.fn_index[depdata] |
185 | # Need to avoid creating new tasks here | 185 | # Need to avoid creating new tasks here |
186 | taskid = taskData.gettask_id(dep, taskname, False) | 186 | taskid = taskData.gettask_id(dep, taskname, False) |
187 | if taskid: | 187 | if taskid is not None: |
188 | depends.append(taskid) | 188 | depends.append(taskid) |
189 | fnid = taskData.tasks_fnid[taskid] | 189 | fnid = taskData.tasks_fnid[taskid] |
190 | else: | 190 | else: |