mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

bitbake/fetch: ensure the go() method completes when not using premirrors

Browse Source 
Signed-off-by: Joshua Lock <josh@linux.intel.com>
This commit is contained in:
Joshua Lock
2010-09-09 17:29:23 +01:00
committed by Richard Purdie
parent dc4d33cf0f
commit c01e8760ba
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/fetch/__init__.py
+10 -6
View File
@@ -234,8 +234,12 @@ def go(d, urls = None):
for u in urls:
ud = urldata[u]
m = ud.method
premirror_fetch = True
localpath = ""
if ud.localfile:
if not m.try_premirror(u, ud, d):
premirror_fetch = False
# File already present along with md5 stamp file
# Touch md5 file to show activity
try:
@@ -243,9 +247,10 @@ def go(d, urls = None):
except:
# Errors aren't fatal here
pass
continue
lf = bb.utils.lockfile(ud.lockfile)
if not m.try_premirror(u, ud, d):
premirror_fetch = False
# If someone else fetched this before we got the lock,
# notice and don't try again
try:
@@ -253,12 +258,11 @@ def go(d, urls = None):
except:
# Errors aren't fatal here
pass
bb.utils.unlockfile(lf)
continue
# First try fetching uri, u, from PREMIRRORS
mirrors = [ i.split() for i in (bb.data.getVar('PREMIRRORS', d, 1) or "").split('\n') if i ]
localpath = try_mirrors(d, u, mirrors, False, m.forcefetch(u, ud, d))
if premirror_fetch:
# First try fetching uri, u, from PREMIRRORS
mirrors = [ i.split() for i in (bb.data.getVar('PREMIRRORS', d, 1) or "").split('\n') if i ]
localpath = try_mirrors(d, u, mirrors, False, m.forcefetch(u, ud, d))
# Need to re-test forcefetch() which will return true if our copy is too old
if m.forcefetch(u, ud, d) or not localpath: