bitbake/fetch2: Ensure original ud is preserved in try_mirror

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index bbd7da16621e699438343ca8e59a0107eff09a16..5a002875861351b90579312795604f0becce725e 100644 (file)
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -399,7 +399,7 @@ def check_network_access(d, info = ""):
     else:
         logger.debug(1, "Fetcher accessed the network with the command %s" % info)
 
-def try_mirrors(d, ud, mirrors, check = False):
+def try_mirrors(d, origud, mirrors, check = False):
     """
     Try to use a mirrored version of the sources.
     This method will be automatically called before the fetchers go.
@@ -410,8 +410,8 @@ def try_mirrors(d, ud, mirrors, check = False):
     """
     ld = d.createCopy()
     for (find, replace) in mirrors:
-        newuri = uri_replace(ud, find, replace, ld)
-        if newuri == ud.url:
+        newuri = uri_replace(origud, find, replace, ld)
+        if newuri == origud.url:
             continue
         try:
             ud = FetchData(newuri, ld)
@@ -430,7 +430,7 @@ def try_mirrors(d, ud, mirrors, check = False):
                 return ud.localpath
 
         except bb.fetch2.BBFetchException:
-            logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, ud.url))
+            logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url))
             bb.utils.remove(ud.localpath)
             continue
     return None