From bd5167d154ac04dbecbda3a157ae8ef6304e0b4e Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Tue, 14 Jul 2015 19:30:57 -0500 Subject: bitbake: fetch2/git.py: latest_versionstring now returns (version, revision) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to know the revision associated with the upstream version in SCM like git, this change broke return convention, oe-core recipeutils get_recipe_upstream_version need to be updated. tests/fetch.py: Updated git latest_versionstring test for comply new convention. [YOCTO #7605] (Bitbake rev: fd175dc90024c503134c11cbd83e77d88c406ac8) 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 13555bd677..8dd8ddb071 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py @@ -697,7 +697,8 @@ class FetchMethodTest(FetcherTest): self.d.setVar("SRCREV", k[2]) self.d.setVar("GITTAGREGEX", 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