From 22d2f7b1caf3d1a05b814df5e01e630ccb839e46 Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Tue, 14 Jul 2015 19:30:58 -0500 Subject: bitbake: fetch2/wget.py: latest_versionstring now returns (version, revision) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now latest_versionstring method returns (version, revision) for comply the new return convention needed by SCM's like git get the current revision. bb/tests/fetch.py: Updated wget latest_versionstring test for comply new convention. [YOCTO #7605] (Bitbake rev: 8d454646cbe1b04758ca178d8c6fcfd02b818b7b) Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie --- bitbake/lib/bb/tests/fetch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/bb/tests/fetch.py') 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): self.d.setVar("REGEX_URI", k[2]) self.d.setVar("REGEX", k[3]) ud = bb.fetch2.FetchData(k[1], self.d) - verstring = ud.method.latest_versionstring(ud, self.d) + pupver = ud.method.latest_versionstring(ud, self.d) + verstring = pupver[0] r = bb.utils.vercmp_string(v, verstring) self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) -- cgit v1.2.3-54-g00ecf