diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-24 21:07:28 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 11:06:58 +0000 |
commit | fef56d28c3efec4876c379898cbc4d4c65303aee (patch) | |
tree | efc6089cbf0a8e22f1f2967233c97a4bf81b6cbd /lib/bb/utils.py | |
parent | 4359b037de578095db2595f119dfb8e3340e1414 (diff) | |
download | bitbake-contrib-fef56d28c3efec4876c379898cbc4d4c65303aee.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>
Diffstat (limited to 'lib/bb/utils.py')
-rw-r--r-- | lib/bb/utils.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 9cb702dbb..b652a6838 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -121,6 +121,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: |