From aa5a2fceaa427288e742ff475d04715b3498db8d Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Wed, 12 Mar 2025 21:43:59 +0100 Subject: [PATCH] [stable-2.18] dnf5: use new pkg_gpgcheck option, fallback to deprecated one (#84791) (#84811) (cherry picked from commit f11dfa7cce0f939a5dc1e11addc6cfbb5c7fe030) --- .../fragments/dnf5-remove-usage-deprecated-option.yml | 2 ++ lib/ansible/modules/dnf5.py | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/dnf5-remove-usage-deprecated-option.yml diff --git a/changelogs/fragments/dnf5-remove-usage-deprecated-option.yml b/changelogs/fragments/dnf5-remove-usage-deprecated-option.yml new file mode 100644 index 00000000000..3c11a9184ee --- /dev/null +++ b/changelogs/fragments/dnf5-remove-usage-deprecated-option.yml @@ -0,0 +1,2 @@ +bugfixes: + - dnf5 - libdnf5 - use ``conf.pkg_gpgcheck`` instead of deprecated ``conf.gpgcheck`` which is used only as a fallback diff --git a/lib/ansible/modules/dnf5.py b/lib/ansible/modules/dnf5.py index 0e429d3a43d..fbc0699c174 100644 --- a/lib/ansible/modules/dnf5.py +++ b/lib/ansible/modules/dnf5.py @@ -567,7 +567,14 @@ class Dnf5Module(YumDnf): elif self.best is not None: conf.best = self.best conf.install_weak_deps = self.install_weak_deps - conf.gpgcheck = not self.disable_gpg_check + try: + # raises AttributeError only on getter if not available + conf.pkg_gpgcheck # pylint: disable=pointless-statement + except AttributeError: + # dnf5 < 5.2.7.0 + conf.gpgcheck = not self.disable_gpg_check + else: + conf.pkg_gpgcheck = not self.disable_gpg_check conf.localpkg_gpgcheck = not self.disable_gpg_check conf.sslverify = self.sslverify conf.clean_requirements_on_remove = self.autoremove