summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch2/wget.py12
-rw-r--r--bitbake/lib/bb/tests/fetch.py3
2 files changed, 8 insertions, 7 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 545f02dcf0..425b6b9a2a 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -507,12 +507,12 @@ class Wget(FetchMethod):
507 if not re.search("\d+", package): 507 if not re.search("\d+", package):
508 current_version[1] = re.sub('_', '.', current_version[1]) 508 current_version[1] = re.sub('_', '.', current_version[1])
509 current_version[1] = re.sub('-', '.', current_version[1]) 509 current_version[1] = re.sub('-', '.', current_version[1])
510 return current_version[1] 510 return (current_version[1], '')
511 511
512 package_regex = self._init_regexes(package, ud, d) 512 package_regex = self._init_regexes(package, ud, d)
513 if package_regex is None: 513 if package_regex is None:
514 bb.warn("latest_versionstring: package %s don't match pattern" % (package)) 514 bb.warn("latest_versionstring: package %s don't match pattern" % (package))
515 return "" 515 return ('', '')
516 bb.debug(3, "latest_versionstring, regex: %s" % (package_regex.pattern)) 516 bb.debug(3, "latest_versionstring, regex: %s" % (package_regex.pattern))
517 517
518 uri = "" 518 uri = ""
@@ -530,12 +530,12 @@ class Wget(FetchMethod):
530 530
531 dirver_pn_regex = re.compile("%s\d?" % (re.escape(pn))) 531 dirver_pn_regex = re.compile("%s\d?" % (re.escape(pn)))
532 if not dirver_pn_regex.search(dirver): 532 if not dirver_pn_regex.search(dirver):
533 return self._check_latest_version_by_dir(dirver, 533 return (self._check_latest_version_by_dir(dirver,
534 package, package_regex, current_version, ud, d) 534 package, package_regex, current_version, ud, d), '')
535 535
536 uri = bb.fetch.encodeurl([ud.type, ud.host, path, ud.user, ud.pswd, {}]) 536 uri = bb.fetch.encodeurl([ud.type, ud.host, path, ud.user, ud.pswd, {}])
537 else: 537 else:
538 uri = regex_uri 538 uri = regex_uri
539 539
540 return self._check_latest_version(uri, package, package_regex, 540 return (self._check_latest_version(uri, package, package_regex,
541 current_version, ud, d) 541 current_version, ud, d), '')
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index 8dd8ddb071..bfa31d02ae 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -708,7 +708,8 @@ class FetchMethodTest(FetcherTest):
708 self.d.setVar("REGEX_URI", k[2]) 708 self.d.setVar("REGEX_URI", k[2])
709 self.d.setVar("REGEX", k[3]) 709 self.d.setVar("REGEX", k[3])
710 ud = bb.fetch2.FetchData(k[1], self.d) 710 ud = bb.fetch2.FetchData(k[1], self.d)
711 verstring = ud.method.latest_versionstring(ud, self.d) 711 pupver = ud.method.latest_versionstring(ud, self.d)
712 verstring = pupver[0]
712 r = bb.utils.vercmp_string(v, verstring) 713 r = bb.utils.vercmp_string(v, verstring)
713 self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) 714 self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring))
714 715