summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2013-12-26 00:01:26 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-06 16:16:33 +0100
commit6a92f7ede3be3edd58d7819aa611b0c5270756bf (patch)
tree17d162e864d402b6da6ab98bd769560e0233ab7a /bitbake/lib/bb
parent8a5af7ff337e452fc9d0d26bcbc3072af3472ef4 (diff)
downloadpoky-6a92f7ede3be3edd58d7819aa611b0c5270756bf.tar.gz
bitbake: fetch2/__init__.py: let try_mirror_url return correct value
The fetcher will try: 1) PREMIRROR 2) Upstream 3) MIRROR If it fails to download from the Upstream, but succeeds from the MIRROR, and ud.localpath != origud.localpath (for example, the git tarball), then we will get the error (e.g.: xf86-video-omapfb): ERROR: Function failed: Fetcher failure for URL: 'xxx'. Unable to fetch URL from any source. ERROR: Logfile of failure stored in: /path/to/log.do_fetch.28024 It should not show the error and let the build go on since it succeeds. (e.g.: xf86-video-omapfb) [YOCTO #5686] (Bitbake rev: 3bb3f1823bdd46ab34577d43f1e39046a32bca77) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 6170e1c9bc..d8f8bbd792 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -809,7 +809,7 @@ def try_mirror_url(newuri, origud, ud, ld, check = False):
809 origud.method.download(origud.url, origud, ld) 809 origud.method.download(origud.url, origud, ld)
810 if hasattr(origud.method,"build_mirror_data"): 810 if hasattr(origud.method,"build_mirror_data"):
811 origud.method.build_mirror_data(origud.url, origud, ld) 811 origud.method.build_mirror_data(origud.url, origud, ld)
812 return None 812 return ud.localpath
813 # Otherwise the result is a local file:// and we symlink to it 813 # Otherwise the result is a local file:// and we symlink to it
814 if not os.path.exists(origud.localpath): 814 if not os.path.exists(origud.localpath):
815 if os.path.islink(origud.localpath): 815 if os.path.islink(origud.localpath):