Sfoglia il codice sorgente

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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ross Burton 6 anni fa
parent
commit
57be5cc622
1 ha cambiato i file con 2 aggiunte e 3 eliminazioni
  1. 2 3
      lib/bb/fetch2/__init__.py

+ 2 - 3
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)