From ef23fa4c6e2bc5e7a16436f035a0dbd2cacae8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 1 Oct 2024 04:56:06 +0200 Subject: [PATCH] vmupdate/dnf: use --setopt=obsoletes=1 instead of --obsoletes DNF5 dropped that CLI option, but the config option remained: https://github.com/rpm-software-management/dnf5/blob/main/doc/changes_from_dnf4.7.rst QubesOS/qubes-issues#9244 (cherry picked from commit a5eb27d197ec6592829e476945de43565324fdf9) --- vmupdate/agent/source/dnf/dnf_cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vmupdate/agent/source/dnf/dnf_cli.py b/vmupdate/agent/source/dnf/dnf_cli.py index fbff8ab..2664e0b 100644 --- a/vmupdate/agent/source/dnf/dnf_cli.py +++ b/vmupdate/agent/source/dnf/dnf_cli.py @@ -95,7 +95,7 @@ def get_action(self, remove_obsolete) -> List[str]: Disable or enforce obsolete flag in dnf/yum. """ if remove_obsolete: - return ["-y", "--obsoletes", "upgrade"] + return ["-y", "--setopt=obsoletes=1", "upgrade"] return ["-y", "--setopt=obsoletes=0", "upgrade" if self.package_manager == "dnf" else "update"]