diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-08 12:40:40 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-10 23:37:16 +0000 |
| commit | aa75e1784c1a347e04c3036469f389ab735fb810 (patch) | |
| tree | 8db8f10837255c029f7aba5211c47c3e1dd0ab11 | |
| parent | 319a9e9baf8a9e363c245990a241b3df49995808 (diff) | |
| download | bitbake-aa75e1784c1a347e04c3036469f389ab735fb810.tar.gz | |
bitbake/fetch2: Ensure original ud is preserved in try_mirror
(From Poky rev: 0713fb6b99486cd08c6036dba7aeb15e3bfb8129)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index bbd7da166..5a0028758 100644 --- a/lib/bb/fetch2/__init__.py +++ b/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 |