diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2015-07-14 19:30:57 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-22 08:23:49 +0100 |
commit | bd5167d154ac04dbecbda3a157ae8ef6304e0b4e (patch) | |
tree | cd5928ca4f7f3f460836f07806c5fbe6a83a12dc /bitbake/lib/bb/tests | |
parent | 4bbc5dd6e7454cc35c263707453a6725bc0d54a5 (diff) | |
download | poky-bd5167d154ac04dbecbda3a157ae8ef6304e0b4e.tar.gz |
bitbake: fetch2/git.py: latest_versionstring now returns (version, revision)
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 <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/tests')
-rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 3 |
1 files changed, 2 insertions, 1 deletions
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): | |||
697 | self.d.setVar("SRCREV", k[2]) | 697 | self.d.setVar("SRCREV", k[2]) |
698 | self.d.setVar("GITTAGREGEX", k[3]) | 698 | self.d.setVar("GITTAGREGEX", k[3]) |
699 | ud = bb.fetch2.FetchData(k[1], self.d) | 699 | ud = bb.fetch2.FetchData(k[1], self.d) |
700 | verstring = ud.method.latest_versionstring(ud, self.d) | 700 | pupver= ud.method.latest_versionstring(ud, self.d) |
701 | verstring = pupver[0] | ||
701 | r = bb.utils.vercmp_string(v, verstring) | 702 | r = bb.utils.vercmp_string(v, verstring) |
702 | self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) | 703 | self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) |
703 | 704 | ||