diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2013-12-26 00:01:26 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-19 13:03:36 +0000 |
commit | c08ca1e4eeb04f78e1354780cf5a4c3855e49572 (patch) | |
tree | 1a8d4916f1169472e92f7559403b54e4b2181fbd | |
parent | 53352e8d388b7fc4da73f95b93dcc087e76d0426 (diff) | |
download | bitbake-c08ca1e4eeb04f78e1354780cf5a4c3855e49572.tar.gz |
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]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/fetch2/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 8f195f2cd..f2a9f15fd 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -810,7 +810,7 @@ def try_mirror_url(origud, ud, ld, check = False): origud.method.download(origud, ld) if hasattr(ud.method,"build_mirror_data"): origud.method.build_mirror_data(origud, ld) - return None + return ud.localpath # Otherwise the result is a local file:// and we symlink to it if not os.path.exists(origud.localpath): if os.path.islink(origud.localpath): |