[oe-commits] [bitbake] 01/01: fetch2: fix checkstatus fallback to MIRRORS

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 57be5cc6228518e60f564570a39cebbeb6cf564e
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Fri Jul 28 17:26:23 2017 +0100

    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 at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/fetch2/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index bd23533..7afb2ae 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.