Skip to contentSkip to conversation

fetch2/__init__.py: let try_mirror_url return correct value

PATCH New Robert Yang 1 participant 2 messages Dec 25, 2013

lore
Share & tools
lore
#0 lore raw

cover fetch2/__init__.py: let try_mirror_url return correct value

The following changes since commit 005af45191ded6185c618c708181b31281e43092:

bitbake: fetch2: avoid printing "no checksum" error message twice (2013-12-22 14:29:13 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib robert/fetch2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/fetch2

Robert Yang (1):
fetch2/__init__.py: let try_mirror_url return correct value

 bitbake/lib/bb/fetch2/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 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/lib/bb/fetch2/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
bitbake/lib/bb/fetch2/__init__.py +1 -1
index 8fdf59c..f93668f 100644
@@ -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):
Signature · 1 line
1.8.3.1