diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-15 18:00:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-16 22:31:51 +0100 |
commit | 2be227190625ed868f5be08aac26665566a623cc (patch) | |
tree | 1e69509c45dfbece1aff8bbb7be05b2e70b7ffbe | |
parent | b6140496e215be3ed074e19f96139687839d2433 (diff) | |
download | poky-2be227190625ed868f5be08aac26665566a623cc.tar.gz |
bitbake: fetch2: Improve mirror building function error handling
First, when building mirror urls we don't do any fetching so we should never
be calling clean functions.
Currently, if a mirror url fails, we don't process it further to see
if there are any mirrors of the mirror.
We should do this even when the mirror url fails, else we may miss out
on valid/useful mappings, particularly in the case of file:// urls.
(Bitbake rev: b7fd3ec9994f664b17fc86423e6e7afac07e897b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index a40a88b3ee..31d9f01c21 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -876,7 +876,9 @@ def build_mirroruris(origud, mirrors, ld): | |||
876 | logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url)) | 876 | logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url)) |
877 | logger.debug(1, str(e)) | 877 | logger.debug(1, str(e)) |
878 | try: | 878 | try: |
879 | ud.method.clean(ud, ld) | 879 | # setup_localpath of file:// urls may fail, we should still see |
880 | # if mirrors of the url exist | ||
881 | adduri(newud, uris, uds) | ||
880 | except UnboundLocalError: | 882 | except UnboundLocalError: |
881 | pass | 883 | pass |
882 | continue | 884 | continue |