[oe-commits] [bitbake] 05/05: fetch2: Handle lockfiles for file:// urls redirected to mirrors

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 913b6ce22cd50eac96e8937c5ffc704bfce2c023
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Mar 24 16:11:56 2016 +0000

    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 at linuxfoundation.org>
---
 lib/bb/fetch2/__init__.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 5df642e..e8cea7f 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):
     """

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.