From 8674e29a8ef11dd933f751ad6282b09ed97a5e81 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Sat, 18 Feb 2023 13:16:32 -0800
Subject: [PATCH] updvercheck: be OK with older update being obsolete too

In the "installed package is newer than the one in the update"
case, also be OK (soft fail) if the update is obsolete, not just
if it's stable.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 updvercheck.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/updvercheck.py b/updvercheck.py
index 1dde82ee..9bc083e5 100644
--- a/updvercheck.py
+++ b/updvercheck.py
@@ -43,7 +43,7 @@ problems = []
 warnings = []
 post = set()
 ret = 0
-updstable = None
+updstableobs = None
 with open(instfname, "r", encoding="utf-8") as ifh:
     for iline in ifh.readlines():
         (_, name, epoch, version, release) = iline.strip().split(" ")
@@ -62,19 +62,19 @@ with open(instfname, "r", encoding="utf-8") as ifh:
                 problems.append(f"{msg} and this is not an update test, please check if this is a problem")
                 continue
             # check if the update is stable
-            if updstable is None:
+            if updstableobs is None:
                 try:
                     url = f"https://bodhi.fedoraproject.org/updates/{updalias}"
                     resp = json.loads(urlopen(url).read().decode("utf8"))   # pylint:disable=consider-using-with
-                    updstable = (resp.get("update", {}).get("status", "") == "stable")
+                    updstableobs = (resp.get("update", {}).get("status", "") in ("stable", "obsolete"))
                 except: # pylint:disable=bare-except
                     problems.append(f"{msg} and Bodhi is unreachable.")
                     continue
-            if updstable:
-                warnings.append(f"{msg} and update is stable, this is probably OK.")
+            if updstableobs:
+                warnings.append(f"{msg} and update is stable or obsolete, this is probably OK.")
             else:
-                problems.append(f"{msg} and update is not stable.")
-                post.add("Installed newer than update and update not stable means older version could be pushed over newer if update goes stable.")
+                problems.append(f"{msg} and update is not stable or obsolete.")
+                post.add("Installed newer than update and update not stable or obsolete means older version could be pushed over newer if update goes stable.")
 
 if warnings:
     print("WARNINGS")