[oe-commits] [bitbake] 01/02: fetch: fix handling of files with incorrect checksums from a premirror

[git at git.openembedded.org]

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

rpurdie pushed a commit to branch 1.34
in repository bitbake.

commit cc52b9b12c60810142252b9cb5d4268e42371b8e
Author: Joshua Lock <joshua.g.lock at intel.com>
AuthorDate: Wed Jun 14 20:30:22 2017 +0100

    fetch: fix handling of files with incorrect checksums from a premirror
    
    Ensure that when an item fetched from a premirror has an invalid checksum the
    fetcher falls back to the usual logic of trying the upstream and any configured
    mirrors.
    
    Signed-off-by: Joshua Lock <joshua.g.lock at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/fetch2/__init__.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 136fc29..b853da3 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -1619,6 +1619,15 @@ class Fetch(object):
                     logger.debug(1, "Trying PREMIRRORS")
                     mirrors = mirror_from_string(self.d.getVar('PREMIRRORS'))
                     localpath = try_mirrors(self, self.d, ud, mirrors, False)
+                    if localpath:
+                        try:
+                            # early checksum verification so that if the checksum of the premirror
+                            # contents mismatch the fetcher can still try upstream and mirrors
+                            update_stamp(ud, self.d)
+                        except ChecksumError as e:
+                            logger.warning("Checksum failure encountered with premirror download of %s - will attempt other sources." % u)
+                            logger.debug(1, str(e))
+                            localpath = ""
 
                 if premirroronly:
                     self.d.setVar("BB_NO_NETWORK", "1")

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