summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-22 12:54:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-21 11:35:08 +0100
commit119b7ff164136c6633783f5501141af126df23fb (patch)
treec214aaea250d13784567e442271ce59c2682e507 /bitbake
parent1162729c791839b151194df43ae1273f364c01fa (diff)
downloadpoky-119b7ff164136c6633783f5501141af126df23fb.tar.gz
bitbake: fetch2: Handle errors orruring when building mirror urls
When we build the mirror urls, its possible an error will occur. If it does, it should just mean we don't attempt this mirror url. The current code actually aborts *all* the mirrors, not just the failed url. This patch catches and logs the exception allowing things to continue. (Bitbake rev: c35cbd1a1403865cf4f59ec88e1881669868103c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 13341a894a..798a29b363 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -462,9 +462,18 @@ def build_mirroruris(origud, mirrors, ld):
462 newuri = uri_replace(ud, find, replace, ld) 462 newuri = uri_replace(ud, find, replace, ld)
463 if not newuri or newuri in uris or newuri == origud.url: 463 if not newuri or newuri in uris or newuri == origud.url:
464 continue 464 continue
465 try:
466 newud = FetchData(newuri, ld)
467 newud.setup_localpath(ld)
468 except bb.fetch2.BBFetchException as e:
469 logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url))
470 logger.debug(1, str(e))
471 try:
472 ud.method.clean(ud, ld)
473 except UnboundLocalError:
474 pass
475 continue
465 uris.append(newuri) 476 uris.append(newuri)
466 newud = FetchData(newuri, ld)
467 newud.setup_localpath(ld)
468 uds.append(newud) 477 uds.append(newud)
469 478
470 adduri(newuri, newud, uris, uds) 479 adduri(newuri, newud, uris, uds)