Use -1, 0, 1 instead of 12, 0, 11 for comparisons in GenericVersion

diff --git a/mkosi/config.py b/mkosi/config.py
index cb1cbbf509c9473a92048d1bd5715ea64ca19ef3..cd56428e736c803565a0fa7fb0955f28fdf5f784 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -1814,8 +1814,8 @@ class GenericVersion:
     # by systemd-analyze compare-versions when called with only two arguments (without a comparison
     # operator), recreated in the compare_versions method.
     _EQUAL = 0
-    _RIGHT_SMALLER = 11
-    _LEFT_SMALLER = 12
+    _RIGHT_SMALLER = 1
+    _LEFT_SMALLER = -1
 
     def __init__(self, version: str):
         self._version = version

diff --git a/tests/test_config.py b/tests/test_config.py
index a1149669398e6d4000d5a503792fb5cad6622e65..c9489bf1f0219c5760570b3144d4a176460ee78d 100644 (file)
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -15,9 +15,9 @@ def test_generic_version_systemd() -> None:
     assert not (GenericVersion("1") > GenericVersion("2"))
     assert not (GenericVersion("1") == GenericVersion("2"))
     assert not (GenericVersion("1") >= GenericVersion("2"))
-    assert GenericVersion.compare_versions("1", "2") == 12
+    assert GenericVersion.compare_versions("1", "2") == -1
     assert GenericVersion.compare_versions("2", "2") == 0
-    assert GenericVersion.compare_versions("2", "1") == 11
+    assert GenericVersion.compare_versions("2", "1") == 1
 
 
 def test_generic_version_spec() -> None: