summaryrefslogtreecommitdiffstats
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-01-19 13:06:21 +0000
commit6dcc4e7ded0910916e145e548045734ae2675639 (patch)
tree13e8d107647e9950ee20f96eedbdd6af95ce7397
parent5e5a7fc37c65688c7e7a57e73268fab93a367143 (diff)
downloadpoky-6dcc4e7ded0910916e145e548045734ae2675639.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: c08ca1e4eeb04f78e1354780cf5a4c3855e49572) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 8f195f2cd9..f2a9f15fd9 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -810,7 +810,7 @@ def try_mirror_url(origud, ud, ld, check = False):
810 origud.method.download(origud, ld) 810 origud.method.download(origud, ld)
811 if hasattr(ud.method,"build_mirror_data"): 811 if hasattr(ud.method,"build_mirror_data"):
812 origud.method.build_mirror_data(origud, ld) 812 origud.method.build_mirror_data(origud, ld)
813 return None 813 return ud.localpath
814 # Otherwise the result is a local file:// and we symlink to it 814 # Otherwise the result is a local file:// and we symlink to it
815 if not os.path.exists(origud.localpath): 815 if not os.path.exists(origud.localpath):
816 if os.path.islink(origud.localpath): 816 if os.path.islink(origud.localpath):