From: Richard Purdie Date: Tue, 28 Mar 2017 11:23:58 +0000 (+0100) Subject: bitbake: fetch2: Ensure we don't have file downloads overwriting each other X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb826208e508222d1d8e73fe7342b40547b4d77b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git bitbake: fetch2: Ensure we don't have file downloads overwriting each other Imagine you have an sstate mirror accessed over http and an SSTATE_MIRRORS which maps file:// urls to http:// urls. File urls set donestampneeded = False, http urls don't. This can result in races in the try_mirror_url() code since it will trigger new downloads after aquiring the lockfile as verify_donestamp() doesn't look at origud and there is no donestamp. verify_donestamp() already has code to look at origud, we're just missing some code at the start of the function to do this. Fix it to avoid these races. (Bitbake rev: b8b14d975a254444461ba857fc6fb8c725de8874) Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 464e66b98a0..ea72025c228 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -625,7 +625,7 @@ def verify_donestamp(ud, d, origud=None): Returns True, if the donestamp exists and is valid, False otherwise. When returning False, any existing done stamps are removed. """ - if not ud.needdonestamp: + if not ud.needdonestamp or (origud and not origud.needdonestamp): return True if not os.path.exists(ud.donestamp):