From: Joerg Behrmann Date: Wed, 12 Jul 2023 08:48:53 +0000 (+0200) Subject: Use -1, 0, 1 instead of 12, 0, 11 for comparisons in GenericVersion X-Git-Tag: v15~82^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1669%2Fhead;p=thirdparty%2Fmkosi.git Use -1, 0, 1 instead of 12, 0, 11 for comparisons in GenericVersion --- diff --git a/mkosi/config.py b/mkosi/config.py index cb1cbbf50..cd56428e7 100644 --- 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 a11496693..c9489bf1f 100644 --- 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: