mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: fetch2: allow fetchers to forward the donestamp management

Browse Source 
This commit is necessary to introduce proxy fetchers and do not modify
the behavior of existing fetchers.

This commit allows fetchers to forwards the "verify_donestamp" and
"update_stamp" functions to a proxy fetcher.

(Bitbake rev: f7612c0704b4252bba5157ce9a94d8888c6d0760)

Signed-off-by: Jean-Marie LEMETAYER <jean-marie.lemetayer@savoirfairelinux.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jean-Marie LEMETAYER
2020-01-24 18:08:07 +01:00
committed by Richard Purdie
parent 73912553c7
commit fb69936b63
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bitbake/lib/bb/fetch2/__init__.py
View File

@@ -1379,6 +1379,18 @@ class FetchMethod(object):
""" """
return False return False
def verify_donestamp(self, ud, d):
"""
Verify the donestamp file
"""
return verify_donestamp(ud, d)
def update_donestamp(self, ud, d):
"""
Update the donestamp file
"""
update_stamp(ud, d)
def _strip_leading_slashes(self, relpath): def _strip_leading_slashes(self, relpath):
""" """
Remove leading slash as os.path.join can't cope Remove leading slash as os.path.join can't cope
@@ -1662,7 +1674,7 @@ class Fetch(object):
try: try:
self.d.setVar("BB_NO_NETWORK", network) self.d.setVar("BB_NO_NETWORK", network)
if verify_donestamp(ud, self.d) and not m.need_update(ud, self.d): if m.verify_donestamp(ud, self.d) and not m.need_update(ud, self.d):
localpath = ud.localpath localpath = ud.localpath
elif m.try_premirror(ud, self.d): elif m.try_premirror(ud, self.d):
logger.debug(1, "Trying PREMIRRORS") logger.debug(1, "Trying PREMIRRORS")
@@ -1672,7 +1684,7 @@ class Fetch(object):
try: try:
# early checksum verification so that if the checksum of the premirror # early checksum verification so that if the checksum of the premirror
# contents mismatch the fetcher can still try upstream and mirrors # contents mismatch the fetcher can still try upstream and mirrors
update_stamp(ud, self.d) m.update_donestamp(ud, self.d)
except ChecksumError as e: except ChecksumError as e:
logger.warning("Checksum failure encountered with premirror download of %s - will attempt other sources." % u) logger.warning("Checksum failure encountered with premirror download of %s - will attempt other sources." % u)
logger.debug(1, str(e)) logger.debug(1, str(e))
@@ -1682,7 +1694,7 @@ class Fetch(object):
self.d.setVar("BB_NO_NETWORK", "1") self.d.setVar("BB_NO_NETWORK", "1")
firsterr = None firsterr = None
verified_stamp = verify_donestamp(ud, self.d) verified_stamp = m.verify_donestamp(ud, self.d)
if not localpath and (not verified_stamp or m.need_update(ud, self.d)): if not localpath and (not verified_stamp or m.need_update(ud, self.d)):
try: try:
if not trusted_network(self.d, ud.url): if not trusted_network(self.d, ud.url):
@@ -1694,7 +1706,7 @@ class Fetch(object):
localpath = ud.localpath localpath = ud.localpath
# early checksum verify, so that if checksum mismatched, # early checksum verify, so that if checksum mismatched,
# fetcher still have chance to fetch from mirror # fetcher still have chance to fetch from mirror
update_stamp(ud, self.d) m.update_donestamp(ud, self.d)
except bb.fetch2.NetworkAccess: except bb.fetch2.NetworkAccess:
raise raise
@@ -1723,7 +1735,7 @@ class Fetch(object):
logger.error(str(firsterr)) logger.error(str(firsterr))
raise FetchError("Unable to fetch URL from any source.", u) raise FetchError("Unable to fetch URL from any source.", u)
update_stamp(ud, self.d) m.update_donestamp(ud, self.d)
except IOError as e: except IOError as e:
if e.errno in [errno.ESTALE]: if e.errno in [errno.ESTALE]: