diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-24 16:11:56 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-24 16:21:03 +0000 |
commit | 913b6ce22cd50eac96e8937c5ffc704bfce2c023 (patch) | |
tree | 384e1f6b2e399637d5059a290109879cb37fb618 /lib/bb/fetch2/__init__.py | |
parent | 1185a5bfe1b05a1b63a927c9583dfc031fdac8a9 (diff) | |
download | bitbake-contrib-913b6ce22cd50eac96e8937c5ffc704bfce2c023.tar.gz |
fetch2: Handle lockfiles for file:// urls redirected to mirrors
We recently dropped lockfiles for file:// urls which in itself makes
sense.
If a file url redirects to something like an http:// mirror, we'd have
no lock taken for the original file and could race against others
trying to download the file. We therefore need to ensure there is a
lock taken in the mirror handling code.
This adds code to take such a lock, assuming it isn't the same lock
as the parent url.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2/__init__.py')
-rw-r--r-- | lib/bb/fetch2/__init__.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 5df642e37..e8cea7feb 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -915,6 +915,10 @@ def rename_bad_checksum(ud, suffix): def try_mirror_url(fetch, origud, ud, ld, check = False): # Return of None or a value means we're finished # False means try another url + + if ud.lockfile and ud.lockfile != origud.lockfile: + lf = bb.utils.lockfile(ud.lockfile) + try: if check: found = ud.method.checkstatus(fetch, ud, ld) @@ -980,6 +984,10 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): except UnboundLocalError: pass return False + finally: + if ud.lockfile and ud.lockfile != origud.lockfile: + bb.utils.unlockfile(lf) + def try_mirrors(fetch, d, origud, mirrors, check = False): """ |