Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated pkg-resources, replace with packaging #152

Merged
merged 1 commit into from
Jul 19, 2024
Merged

Remove deprecated pkg-resources, replace with packaging #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions vmupdate/agent/source/plugins/manage_rpm_macro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,23 @@

import os

import pkg_resources


def manage_rpm_macro(os_data, log, **kwargs):
"""
Prepare requirements depend on os version.
"""
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")):
log.info("Old fedora version detected.")
with open(rpm_macro, "w") as file:
file.write("# CVE-2021-20271 mitigation\n"
"%_pkgverify_level all")
if os_data["id"] == "fedora":
try:
version = int(os_data["release"].split(".")[0])
except ValueError:
version = 99 # fedora changed its version
if version < 33:
log.info("Old fedora version detected.")
with open(rpm_macro, "w") as file:
file.write("# CVE-2021-20271 mitigation\n"
"%_pkgverify_level all")
else:
if os.path.exists(rpm_macro):
os.remove(rpm_macro)
Expand Down
1 change: 0 additions & 1 deletion vmupdate/agent/source/plugins/updatesproxy_fix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import os
import pathlib
import pkg_resources


def updatesproxy_fix(os_data, log, **kwargs):
Expand Down
6 changes: 2 additions & 4 deletions vmupdate/agent/source/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import ast
from typing import Optional, Dict, Any

import pkg_resources


def get_os_data(logger: Optional = None) -> Dict[str, Any]:
"""
Expand All @@ -34,7 +32,7 @@ def get_os_data(logger: Optional = None) -> Dict[str, Any]:
id: "linux" or a lower-case string identifying the operating system,
name: "Linux" or a string identifying the operating system,
codename (optional): an operating system release code name,
release (optional): packaging.version.Version,
release (optional): version string,
os_family: "Unknown", "RedHat", "Debian", "ArchLinux".
"""
data = {}
Expand All @@ -49,7 +47,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"] = release
if "VERSION_CODENAME" in os_release:
data["codename"] = os_release["VERSION_CODENAME"]

Expand Down