From: Robert Yang Date: Wed, 25 Dec 2013 16:01:26 +0000 (+0800) Subject: fetch2/__init__.py: let try_mirror_url return correct value X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c08ca1e4eeb04f78e1354780cf5a4c3855e49572;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 8f195f2cd9c..f2a9f15fd9c 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):