diff options
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/tests/utils.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/utils.py | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/bitbake/lib/bb/tests/utils.py b/bitbake/lib/bb/tests/utils.py index 2f4ccf3c62..f1cd83a419 100644 --- a/bitbake/lib/bb/tests/utils.py +++ b/bitbake/lib/bb/tests/utils.py | |||
@@ -42,6 +42,10 @@ class VerCmpString(unittest.TestCase): | |||
42 | self.assertTrue(result < 0) | 42 | self.assertTrue(result < 0) |
43 | result = bb.utils.vercmp_string('1.1', '1.0+1.1-beta1') | 43 | result = bb.utils.vercmp_string('1.1', '1.0+1.1-beta1') |
44 | self.assertTrue(result > 0) | 44 | self.assertTrue(result > 0) |
45 | result = bb.utils.vercmp_string('1.', '1.1') | ||
46 | self.assertTrue(result < 0) | ||
47 | result = bb.utils.vercmp_string('1.1', '1.') | ||
48 | self.assertTrue(result > 0) | ||
45 | 49 | ||
46 | def test_explode_dep_versions(self): | 50 | def test_explode_dep_versions(self): |
47 | correctresult = {"foo" : ["= 1.10"]} | 51 | correctresult = {"foo" : ["= 1.10"]} |
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 9cb702dbb7..b652a6838a 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
@@ -121,6 +121,10 @@ def vercmp_part(a, b): | |||
121 | return -1 | 121 | return -1 |
122 | elif oa > ob: | 122 | elif oa > ob: |
123 | return 1 | 123 | return 1 |
124 | elif ca is None: | ||
125 | return -1 | ||
126 | elif cb is None: | ||
127 | return 1 | ||
124 | elif ca < cb: | 128 | elif ca < cb: |
125 | return -1 | 129 | return -1 |
126 | elif ca > cb: | 130 | elif ca > cb: |