[bitbake-devel] bitbake: fix version comparison when one of the versions ends in .

Submitted by Alexander Kanavin on Feb. 24, 2019, 8:07 p.m. | Patch ID: 159055

Details

Message ID 20190224200728.110431-1-alex.kanavin@gmail.com
State Superseded
Headers show

Commit Message

Alexander Kanavin Feb. 24, 2019, 8:07 p.m.
Previously, this would happen:

Patch hide | download patch | download mbox

======================================================================
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>
---
 bitbake/lib/bb/tests/utils.py | 4 ++++
 bitbake/lib/bb/utils.py       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/bitbake/lib/bb/tests/utils.py b/bitbake/lib/bb/tests/utils.py
index 2f4ccf3c62b..f1cd83a4195 100644
--- a/bitbake/lib/bb/tests/utils.py
+++ b/bitbake/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/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 9cb702dbb7a..b652a6838a2 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/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:

Comments

Martin Jansa June 15, 2019, 5:17 p.m.
This is a system generated Comment: Patch 159055 was automatically marked as superseded by patch 162225.