From c3ca3757c93266c9d0f9d219c0dc67380a8e032f Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Mon, 10 Jun 2019 09:21:42 -0500
Subject: [PATCH] Provide a better error when python-dnf install fails (#57622)

---
 changelogs/fragments/dnf-better-error.yml |  2 ++
 lib/ansible/modules/packaging/os/dnf.py   | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/fragments/dnf-better-error.yml

diff --git a/changelogs/fragments/dnf-better-error.yml b/changelogs/fragments/dnf-better-error.yml
new file mode 100644
index 00000000000..3b0f261e279
--- /dev/null
+++ b/changelogs/fragments/dnf-better-error.yml
@@ -0,0 +1,2 @@
+minor_changes:
+- dnf - Provide a better error message including python version info when installing python-dnf fails
diff --git a/lib/ansible/modules/packaging/os/dnf.py b/lib/ansible/modules/packaging/os/dnf.py
index 25454ddd559..fd973009304 100644
--- a/lib/ansible/modules/packaging/os/dnf.py
+++ b/lib/ansible/modules/packaging/os/dnf.py
@@ -285,6 +285,7 @@ EXAMPLES = '''
 
 import os
 import re
+import sys
 import tempfile
 
 try:
@@ -488,7 +489,7 @@ class DnfModule(YumDnf):
                     results=[],
                 )
 
-            self.module.run_command(['dnf', 'install', '-y', package], check_rc=True)
+            rc, stdout, stderr = self.module.run_command(['dnf', 'install', '-y', package])
             global dnf
             try:
                 import dnf
@@ -499,9 +500,15 @@ class DnfModule(YumDnf):
                 import dnf.util
             except ImportError:
                 self.module.fail_json(
-                    msg="Could not import the dnf python module. "
-                    "Please install `{0}` package.".format(package),
+                    msg="Could not import the dnf python module using {0} ({1}). "
+                        "Please install `{2}` package or ensure you have specified the "
+                        "correct ansible_python_interpreter.".format(sys.executable, sys.version.replace('\n', ''),
+                                                                     package),
                     results=[],
+                    cmd='dnf install -y {0}'.format(package),
+                    rc=rc,
+                    stdout=stdout,
+                    stderr=stderr,
                 )
 
     def _configure_base(self, base, conf_file, disable_gpg_check, installroot='/'):