From 4211fcdd78c60a7ddf90cab48153612e1d186ddf Mon Sep 17 00:00:00 2001 From: Piotr Bartman Date: Wed, 8 May 2024 18:52:36 +0200 Subject: [PATCH] updater: get rid of deprecated `pkg_resources` minor change to keep health dependencies --- vmupdate/agent/source/plugins/manage_rpm_macro.py | 5 ++--- vmupdate/agent/source/plugins/updatesproxy_fix.py | 4 +--- vmupdate/agent/source/utils.py | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/vmupdate/agent/source/plugins/manage_rpm_macro.py b/vmupdate/agent/source/plugins/manage_rpm_macro.py index a0806693..44ddd31c 100644 --- a/vmupdate/agent/source/plugins/manage_rpm_macro.py +++ b/vmupdate/agent/source/plugins/manage_rpm_macro.py @@ -20,8 +20,7 @@ # USA. import os - -import pkg_resources +from packaging import version def manage_rpm_macro(os_data, log, **kwargs): @@ -31,7 +30,7 @@ def manage_rpm_macro(os_data, log, **kwargs): if os_data["os_family"] == "RedHat": rpm_macro = "/usr/lib/rpm/macros.d/macros.qubes" if (os_data["id"] == "fedora" - and os_data["release"] < pkg_resources.parse_version("33")): + and os_data["release"] < version.parse("33")): log.info("Old fedora version detected.") with open(rpm_macro, "w") as file: file.write("# CVE-2021-20271 mitigation\n" diff --git a/vmupdate/agent/source/plugins/updatesproxy_fix.py b/vmupdate/agent/source/plugins/updatesproxy_fix.py index 6a4f2b8e..996197df 100644 --- a/vmupdate/agent/source/plugins/updatesproxy_fix.py +++ b/vmupdate/agent/source/plugins/updatesproxy_fix.py @@ -20,9 +20,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. -import os import pathlib -import pkg_resources def updatesproxy_fix(os_data, log, **kwargs): @@ -33,7 +31,7 @@ def updatesproxy_fix(os_data, log, **kwargs): rpc_filename = "/etc/qubes-rpc/qubes.UpdatesProxy" rpc_path = pathlib.Path(rpc_filename) # qubes.UpdatesProxy file doesn't exist on template without - # qubes-core-agent-networking package + # a qubes-core-agent-networking package if rpc_path.exists(): if "STDIO TCP:localhost:8082" in rpc_path.read_text(): with rpc_path.open("w") as f: diff --git a/vmupdate/agent/source/utils.py b/vmupdate/agent/source/utils.py index d267b450..129caf6d 100644 --- a/vmupdate/agent/source/utils.py +++ b/vmupdate/agent/source/utils.py @@ -23,7 +23,7 @@ import ast from typing import Optional, Dict, Any -import pkg_resources +from packaging import version def get_os_data(logger: Optional = None) -> Dict[str, Any]: @@ -49,7 +49,7 @@ def get_os_data(logger: Optional = None) -> Dict[str, Any]: data["name"] = os_release.get("NAME", "Linux").strip() if "VERSION_ID" in os_release: release = os_release["VERSION_ID"] - data["release"] = pkg_resources.parse_version(release) + data["release"] = version.parse(release) if "VERSION_CODENAME" in os_release: data["codename"] = os_release["VERSION_CODENAME"]