From 6a5931b7dd97ff556c484ccdc7354063b2ad13f5 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Oct 31 2022 17:54:37 +0000
Subject: Fix CargoSemVer.eval_ KIND_GTE and KIND_LTE comparisons


Just make use of KIND_GT/KIND_LT and KIND_SHORTEQ

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>

---

diff --git a/rust2rpm/core/metadata.py b/rust2rpm/core/metadata.py
index 6d740d0..7f2bb1f 100644
--- a/rust2rpm/core/metadata.py
+++ b/rust2rpm/core/metadata.py
@@ -166,9 +166,8 @@ class CargoSemVer:
             )
         elif op == CargoSemVer.KIND_GTE:
             return (
-                (v1.major >= v2.major)
-                or (v1.major == v2.major and v1.minor >= v2.minor)
-                or (v1.major == v2.major and v1.minor == v2.minor and v1.patch >= v2.patch)
+                CargoSemVer.eval_(v1, CargoSemVer.KIND_GT, v2)
+                or CargoSemVer.eval_(v1, CargoSemVer.KIND_SHORTEQ, v2)
             )
         elif op == CargoSemVer.KIND_LT:
             return (
@@ -178,9 +177,8 @@ class CargoSemVer:
             )
         elif op == CargoSemVer.KIND_LTE:
             return (
-                (v1.major <= v2.major)
-                or (v1.major == v2.major and v1.minor <= v2.minor)
-                or (v1.major == v2.major and v1.minor == v2.minor and v1.patch <= v2.patch)
+                CargoSemVer.eval_(v1, CargoSemVer.KIND_LT, v2)
+                or CargoSemVer.eval_(v1, CargoSemVer.KIND_SHORTEQ, v2)
             )
         else:
             raise ValueError(f"Cannot evaluate operator: {op}")