diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-06-15 07:17:43 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-15 11:06:14 +0100 |
commit | bd953d56d007a8bfa5ecb6e753da4abfb035f9f2 (patch) | |
tree | 9f1c79996338737fe5487e1d63f419cf4fff9430 | |
parent | da5d1560d4ad1c735f6166a5d9ce94f36c94186b (diff) | |
download | bitbake-contrib-bd953d56d007a8bfa5ecb6e753da4abfb035f9f2.tar.gz |
bitbake: fix version comparison when one of the versions ends in .
Previously, this would happen:
======================================================================
ERROR: test_vercmpstring (bb.tests.utils.VerCmpString)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/alexander/development/poky/bitbake/lib/bb/tests/utils.py", line 45, in test_vercmpstring
result = bb.utils.vercmp_string('1.', '1.1')
File "/home/alexander/development/poky/bitbake/lib/bb/utils.py", line 143, in vercmp_string
return vercmp(ta, tb)
File "/home/alexander/development/poky/bitbake/lib/bb/utils.py", line 135, in vercmp
r = vercmp_part(va, vb)
File "/home/alexander/development/poky/bitbake/lib/bb/utils.py", line 124, in vercmp_part
elif ca < cb:
TypeError: '<' not supported between instances of 'NoneType' and 'int'
----------------------------------------------------------------------
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/tests/utils.py | 4 | ||||
-rw-r--r-- | lib/bb/utils.py | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/bb/tests/utils.py b/lib/bb/tests/utils.py index 2f4ccf3c6..f1cd83a41 100644 --- a/lib/bb/tests/utils.py +++ b/lib/bb/tests/utils.py @@ -42,6 +42,10 @@ class VerCmpString(unittest.TestCase): self.assertTrue(result < 0) result = bb.utils.vercmp_string('1.1', '1.0+1.1-beta1') self.assertTrue(result > 0) + result = bb.utils.vercmp_string('1.', '1.1') + self.assertTrue(result < 0) + result = bb.utils.vercmp_string('1.1', '1.') + self.assertTrue(result > 0) def test_explode_dep_versions(self): correctresult = {"foo" : ["= 1.10"]} diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 73b6cb423..215c18cfa 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -120,6 +120,10 @@ def vercmp_part(a, b): return -1 elif oa > ob: return 1 + elif ca is None: + return -1 + elif cb is None: + return 1 elif ca < cb: return -1 elif ca > cb: |