fetch2: Handle lockfiles for file:// urls redirected to mirrors

PATCH New Richard Purdie 1 participant 1 message Mar 24, 2016

lore

Share & tools

lore

Richard Purdie

author

2016-03-24 16:11 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

bitbake/lib/bb/fetch2/__init__.py +8 -0

index f86014c..d87d8e8 100644
@@ -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):
     """