From f9ea480e6c26fea46c3011c4e9d0e2de3d5c81b4 Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Tue, 30 Jun 2015 09:39:11 -0500 Subject: bitbake: fetch2: Add fetch parameter to checkstatus MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to pass connection cache object to checkstatus function add fetch parameter. (Bitbake rev: fbb9c6f5538084e125b58118a86968908e6f895b) Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 20 ++++++++++---------- bitbake/lib/bb/fetch2/git.py | 2 +- bitbake/lib/bb/fetch2/local.py | 2 +- bitbake/lib/bb/fetch2/wget.py | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 7fd9ec7bf1..8d0221decc 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -907,12 +907,12 @@ def rename_bad_checksum(ud, suffix): bb.utils.movefile(ud.localpath, new_localpath) -def try_mirror_url(origud, ud, ld, check = False): +def try_mirror_url(fetch, origud, ud, ld, check = False): # Return of None or a value means we're finished # False means try another url try: if check: - found = ud.method.checkstatus(ud, ld) + found = ud.method.checkstatus(fetch, ud, ld) if found: return found return False @@ -975,7 +975,7 @@ def try_mirror_url(origud, ud, ld, check = False): pass return False -def try_mirrors(d, origud, mirrors, check = False): +def try_mirrors(fetch, d, origud, mirrors, check = False): """ Try to use a mirrored version of the sources. This method will be automatically called before the fetchers go. @@ -989,7 +989,7 @@ def try_mirrors(d, origud, mirrors, check = False): uris, uds = build_mirroruris(origud, mirrors, ld) for index, uri in enumerate(uris): - ret = try_mirror_url(origud, uds[index], ld, check) + ret = try_mirror_url(fetch, origud, uds[index], ld, check) if ret != False: return ret return None @@ -1473,7 +1473,7 @@ class FetchMethod(object): """ return True - def checkstatus(self, urldata, d): + def checkstatus(self, fetch, urldata, d): """ Check the status of a URL Assumes localpath was called first @@ -1577,7 +1577,7 @@ class Fetch(object): elif m.try_premirror(ud, self.d): logger.debug(1, "Trying PREMIRRORS") mirrors = mirror_from_string(self.d.getVar('PREMIRRORS', True)) - localpath = try_mirrors(self.d, ud, mirrors, False) + localpath = try_mirrors(self, self.d, ud, mirrors, False) if premirroronly: self.d.setVar("BB_NO_NETWORK", "1") @@ -1616,7 +1616,7 @@ class Fetch(object): m.clean(ud, self.d) logger.debug(1, "Trying MIRRORS") mirrors = mirror_from_string(self.d.getVar('MIRRORS', True)) - localpath = try_mirrors (self.d, ud, mirrors) + localpath = try_mirrors(self, self.d, ud, mirrors) if not localpath or ((not os.path.exists(localpath)) and localpath.find("*") == -1): if firsterr: @@ -1648,15 +1648,15 @@ class Fetch(object): logger.debug(1, "Testing URL %s", u) # First try checking uri, u, from PREMIRRORS mirrors = mirror_from_string(self.d.getVar('PREMIRRORS', True)) - ret = try_mirrors(self.d, ud, mirrors, True) + ret = try_mirrors(self, self.d, ud, mirrors, True) if not ret: # Next try checking from the original uri, u try: - ret = m.checkstatus(ud, self.d) + ret = m.checkstatus(self, ud, self.d) except: # Finally, try checking uri, u, from MIRRORS mirrors = mirror_from_string(self.d.getVar('MIRRORS', True)) - ret = try_mirrors(self.d, ud, mirrors, True) + ret = try_mirrors(self, self.d, ud, mirrors, True) if not ret: raise FetchError("URL %s doesn't work" % u, u) diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 2e5388221f..0abd67924b 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py @@ -423,7 +423,7 @@ class Git(FetchMethod): else: return True, str(rev) - def checkstatus(self, ud, d): + def checkstatus(self, fetch, ud, d): try: self._lsremote(ud, d, "") return True diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py index 0785236a6b..2d921f7e55 100644 --- a/bitbake/lib/bb/fetch2/local.py +++ b/bitbake/lib/bb/fetch2/local.py @@ -112,7 +112,7 @@ class Local(FetchMethod): return True - def checkstatus(self, urldata, d): + def checkstatus(self, fetch, urldata, d): """ Check the status of the url """ diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index 162a6bd3be..abacbcf796 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -100,7 +100,7 @@ class Wget(FetchMethod): return True - def checkstatus(self, ud, d): + def checkstatus(self, fetch, ud, d): uri = ud.url.split(";")[0] fetchcmd = self.basecmd + " --spider '%s'" % uri -- cgit v1.2.3-54-g00ecf