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 | openembedded-core-7611768e23d9809f458691454c2aeb60d7b26e7d.tar.gz openembedded-core-7611768e23d9809f458691454c2aeb60d7b26e7d.tar.bz2 openembedded-core-7611768e23d9809f458691454c2aeb60d7b26e7d.zip | |
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  # with this program; if not, write to the Free Software Foundation, Inc.,  # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from bb import msg, data, fetch, event, mkdirhier, utils +from bb import msg, data, event, mkdirhier, utils  from sets import Set   import bb, os, sys  import signal @@ -113,7 +113,7 @@ class RunQueue:                          # Won't be in build_targets if ASSUME_PROVIDED                          if depid in taskData.build_targets:                              depdata = taskData.build_targets[depid][0] -                            if depdata: +                            if depdata is not None:                                  dep = taskData.fn_index[depdata]                                  depends.append(taskData.gettask_id(dep, taskname)) @@ -123,7 +123,7 @@ class RunQueue:                      for depid in taskData.rdepids[fnid]:                          if depid in taskData.run_targets:                              depdata = taskData.run_targets[depid][0] -                            if depdata: +                            if depdata is not None:                                  dep = taskData.fn_index[depdata]                                  depends.append(taskData.gettask_id(dep, taskname)) @@ -133,7 +133,7 @@ class RunQueue:                      if depid in taskData.build_targets:                          # Won't be in build_targets if ASSUME_PROVIDED                          depdata = taskData.build_targets[depid][0] -                        if depdata: +                        if depdata is not None:                              dep = taskData.fn_index[depdata]                              depends.append(taskData.gettask_id(dep, idepend.split(":")[1])) @@ -148,11 +148,11 @@ class RunQueue:                      dep_seen.append(depid)                      if depid in taskData.build_targets:                          depdata = taskData.build_targets[depid][0] -                        if depdata: +                        if depdata is not None:                              dep = taskData.fn_index[depdata]                              # Need to avoid creating new tasks here                              taskid = taskData.gettask_id(dep, taskname, False) -                            if taskid: +                            if taskid is not None:                                  depends.append(taskid)                                  fnid = taskData.tasks_fnid[taskid]                              else: @@ -180,11 +180,11 @@ class RunQueue:                      rdep_seen.append(rdepid)                      if rdepid in taskData.run_targets:                          depdata = taskData.run_targets[rdepid][0] -                        if depdata: +                        if depdata is not None:                              dep = taskData.fn_index[depdata]                              # Need to avoid creating new tasks here                              taskid = taskData.gettask_id(dep, taskname, False) -                            if taskid: +                            if taskid is not None:                                  depends.append(taskid)                                  fnid = taskData.tasks_fnid[taskid]                              else: | 
