summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-07-28 17:26:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-31 15:13:52 +0100
commit6986198da9929d017bf2ff259025c38f7bdad68f (patch)
tree58eabc44aad993f1b3a44fbc4b811568be3e35c9 /bitbake/lib/bb/fetch2
parent6f12ac612ca29adc2f2a40526a757adfee92fb12 (diff)
downloadpoky-6986198da9929d017bf2ff259025c38f7bdad68f.tar.gz
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index bd23533ebc..7afb2aeb73 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1726,9 +1726,8 @@ class Fetch(object):
1726 ret = try_mirrors(self, self.d, ud, mirrors, True) 1726 ret = try_mirrors(self, self.d, ud, mirrors, True)
1727 if not ret: 1727 if not ret:
1728 # Next try checking from the original uri, u 1728 # Next try checking from the original uri, u
1729 try: 1729 ret = m.checkstatus(self, ud, self.d)
1730 ret = m.checkstatus(self, ud, self.d) 1730 if not ret:
1731 except:
1732 # Finally, try checking uri, u, from MIRRORS 1731 # Finally, try checking uri, u, from MIRRORS
1733 mirrors = mirror_from_string(self.d.getVar('MIRRORS')) 1732 mirrors = mirror_from_string(self.d.getVar('MIRRORS'))
1734 ret = try_mirrors(self, self.d, ud, mirrors, True) 1733 ret = try_mirrors(self, self.d, ud, mirrors, True)