From: Ross Burton Date: Fri, 28 Jul 2017 16:26:23 +0000 (+0100) Subject: bitbake: fetch2: fix checkstatus fallback to MIRRORS X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6986198da9929d017bf2ff259025c38f7bdad68f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git bitbake: fetch2: fix checkstatus fallback to MIRRORS The checkstatus() code was expecting checkstatus to throw exceptions if it failed, but in general it should return False. (Bitbake rev: 57be5cc6228518e60f564570a39cebbeb6cf564e) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index bd23533ebc0..7afb2aeb734 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -1726,9 +1726,8 @@ class Fetch(object): ret = try_mirrors(self, self.d, ud, mirrors, True) if not ret: # Next try checking from the original uri, u - try: - ret = m.checkstatus(self, ud, self.d) - except: + ret = m.checkstatus(self, ud, self.d) + if not ret: # Finally, try checking uri, u, from MIRRORS mirrors = mirror_from_string(self.d.getVar('MIRRORS')) ret = try_mirrors(self, self.d, ud, mirrors, True)