dnf5: utilize automatic gpg check via transaction.run() (ansible#81144)

rpm-software-management/dnf5#607 (cherry picked from commit c3af71a)
mkrizek · Jul 10, 2023 · 369c66c · 369c66c
1 parent 94a6f6e
commit 369c66c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/changelogs/fragments/dnf5-gpg-check-builtin.yml b/changelogs/fragments/dnf5-gpg-check-builtin.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - Utilize gpg check provided internally by the ``transaction.run`` method as oppose to calling it manually.
diff --git a/lib/ansible/modules/dnf5.py b/lib/ansible/modules/dnf5.py
@@ -670,16 +670,15 @@ def run(self):
         else:
             transaction.download()
             if not self.download_only:
-                if not self.disable_gpg_check and not transaction.check_gpg_signatures():
+                transaction.set_description("ansible dnf5 module")
+                result = transaction.run()
+                if result == libdnf5.base.Transaction.TransactionRunResult_ERROR_GPG_CHECK:
                     self.module.fail_json(
                         msg="Failed to validate GPG signatures: {}".format(",".join(transaction.get_gpg_signature_problems())),
                         failures=[],
                         rc=1,
                     )
-
-                transaction.set_description("ansible dnf5 module")
-                result = transaction.run()
-                if result != libdnf5.base.Transaction.TransactionRunResult_SUCCESS:
+                elif result != libdnf5.base.Transaction.TransactionRunResult_SUCCESS:
                     self.module.fail_json(
                         msg="Failed to install some of the specified packages",
                         failures=["{}: {}".format(transaction.transaction_result_to_string(result), log) for log in transaction.get_transaction_problems()],