From 39365cafaa1b48a100cd34c9057624b46bc6306d Mon Sep 17 00:00:00 2001 From: FrantiĊĦek Zatloukal Date: Oct 26 2020 13:24:34 +0000 Subject: Rename release_from_nevra to release_from_nvr The function really implements just the nvr and breaks in a terrible way when gets nevra. --- diff --git a/oraculum/utils/bodhi.py b/oraculum/utils/bodhi.py index b11cd0d..9901eb1 100644 --- a/oraculum/utils/bodhi.py +++ b/oraculum/utils/bodhi.py @@ -26,7 +26,7 @@ from bodhi.client.bindings import BodhiClient import datetime from oraculum import app -from oraculum.utils.dashboard_helpers import release_from_nevra, name_in_nevra +from oraculum.utils.dashboard_helpers import release_from_nvr, name_in_nevra def query_bodhi(bodhi_client, release, pending=False): @@ -73,7 +73,7 @@ def process_update(update): datetime.datetime.fromisoformat(update["date_modified"] or update["date_submitted"]) + datetime.timedelta(days=update["stable_days"]) ) if update["autotime"] else None, - "release": release_from_nevra(update["title"]), + "release": release_from_nvr(update["title"]), "url": update["url"], "status": update["status"], "karma": update["karma"], @@ -90,7 +90,7 @@ def process_override(override): "url": "https://bodhi.fedoraproject.org/overrides/" + override["nvr"], "submission_date": override["submission_date"], "expiration_date": override["expiration_date"], - "release": release_from_nevra(override["nvr"]) + "release": release_from_nvr(override["nvr"]) } @@ -103,7 +103,7 @@ def get_updates(packages, raw_updates): "updateid": update["alias"], "submission_date": update["date_submitted"], "stable_by_time": (update["date_submitted"] + update["stable_days"]) if update["autotime"] else None, - "release": release_from_nevra(update["title"]), + "release": release_from_nvr(update["title"]), "url": update["url"], "status": update["status"], "karma": update["karma"], @@ -172,7 +172,7 @@ def get_user_overrides(packages, raw_overrides): "url": "https://bodhi.fedoraproject.org/overrides/" + override["nvr"], "submission_date": override["submission_date"], "expiration_date": override["expiration_date"], - "release": release_from_nevra(override["nvr"]) + "release": release_from_nvr(override["nvr"]) } """ data = {} diff --git a/oraculum/utils/dashboard_helpers.py b/oraculum/utils/dashboard_helpers.py index c6b9b22..8654caa 100644 --- a/oraculum/utils/dashboard_helpers.py +++ b/oraculum/utils/dashboard_helpers.py @@ -142,17 +142,17 @@ def release_from_number(release_num): return "Fedora %s" % release_num -def release_from_nevra(nevra): +def release_from_nvr(nvr): """ - Returns Fedora XX or EPEL X from nevra + Returns Fedora XX or EPEL X from nvr """ - split = nevra.split(".")[-1] + split = nvr.split(".")[-1] if len(split) <= 1: return "Unknown" - if "fedora-obsolete-packages" in nevra: + if "fedora-obsolete-packages" in nvr: # fedora-obsolete-packages does not contain distag, workaround it # eg. "fedora-obsolete-packages-32-51", release is "Fedora 32" - return release_from_dist(nevra.split("-")[3]) + return release_from_dist(nvr.split("-")[3]) return release_from_dist(split)