[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7054/8267] bitbake: fetch2: fix checkstatus fallback to MIRRORS



commit 6986198da9929d017bf2ff259025c38f7bdad68f
Author: Ross Burton <ross burton intel com>
Date:   Fri Jul 28 17:26:23 2017 +0100

    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>

 bitbake/lib/bb/fetch2/__init__.py |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index bd23533..7afb2ae 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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]