From ba50c2f4b9619d355abddc19624b7a7798c71c6f Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 26 Aug 2015 09:37:46 -0700 Subject: bitbake: bb.fetch: handle checksums consistently for mirrors If the main fetch method doesn't support checksums, the user will not be defining them in the recipe, so we don't want to check them for premirrors/mirrors either. This ensures that we never error due to missing checksums on a git mirror tarball. (Bitbake rev: 24c79bbed361b37f12d3351af13602e3d4386f4c) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/fetch2/__init__.py') diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index ec0c31ae21..e229c30f61 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -628,7 +628,7 @@ def verify_checksum(ud, d, precomputed={}): } -def verify_donestamp(ud, d): +def verify_donestamp(ud, d, origud=None): """ Check whether the done stamp file has the right checksums (if the fetch method supports them). If it doesn't, delete the done stamp and force @@ -640,7 +640,8 @@ def verify_donestamp(ud, d): if not os.path.exists(ud.donestamp): return False - if not ud.method.supports_checksum(ud): + if (not ud.method.supports_checksum(ud) or + (origud and not origud.method.supports_checksum(origud))): # done stamp exists, checksums not supported; assume the local file is # current return True @@ -922,7 +923,7 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): os.chdir(ld.getVar("DL_DIR", True)) - if not verify_donestamp(ud, ld) or ud.method.need_update(ud, ld): + if not verify_donestamp(ud, ld, origud) or ud.method.need_update(ud, ld): ud.method.download(ud, ld) if hasattr(ud.method,"build_mirror_data"): ud.method.build_mirror_data(ud, ld) -- cgit v1.2.3-54-g00ecf