From d993f172e806b095fa8bf799f11f975f6a5c238b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 13 May 2012 07:40:42 +0000 Subject: bitbake/fetch2: Improve stamp creation in mirror code Under certain contitions such as local file:// mirrors of all files, bitbake might not check checksums. This is not desirable and we should always check the checksum where possible. This only exception to this is the git mirror tarball case where the checksum is unknown but we need to create the .done stamp for other reasons. This patch preserves thta functionality but in a more specific section of code where this doesn't interfere in normal checksums. (Bitbake rev: 2592a43e422c06a6f6174ada562e9c8ba25e1ec1) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 5d7ef1f014..ba6849e09d 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -476,10 +476,8 @@ def try_mirrors(d, origud, mirrors, check = False): if not os.path.exists(ud.donestamp) or ud.method.need_update(newuri, ud, ld): ud.method.download(newuri, ud, ld) - if os.path.exists(ud.localpath): - open(ud.donestamp, 'w').close() - if hasattr(ud.method,"build_mirror_data"): - ud.method.build_mirror_data(newuri, ud, ld) + if hasattr(ud.method,"build_mirror_data"): + ud.method.build_mirror_data(newuri, ud, ld) if not ud.localpath or not os.path.exists(ud.localpath): continue @@ -491,6 +489,7 @@ def try_mirrors(d, origud, mirrors, check = False): # If that tarball is a local file:// we need to provide a symlink to it dldir = ld.getVar("DL_DIR", True) if os.path.basename(ud.localpath) != os.path.basename(origud.localpath): + open(ud.donestamp, 'w').close() dest = os.path.join(dldir, os.path.basename(ud.localpath)) if not os.path.exists(dest): os.symlink(ud.localpath, dest) @@ -498,6 +497,7 @@ def try_mirrors(d, origud, mirrors, check = False): # Otherwise the result is a local file:// and we symlink to it if not os.path.exists(origud.localpath): os.symlink(ud.localpath, origud.localpath) + update_stamp(newuri, origud, ld) return ud.localpath except bb.fetch2.NetworkAccess: -- cgit v1.2.3-54-g00ecf