From 52430d42285735d6cdc45d7abed6bc99b2391dd5 Mon Sep 17 00:00:00 2001
From: Abhijeet Kasurde <akasurde@redhat.com>
Date: Mon, 24 May 2021 22:32:28 +0530
Subject: [PATCH] dnf - fix whatprovides API block (#74764)

* Added additional query block
---
 .../fragments/73503_dnf_whatprovides.yml      |  2 ++
 lib/ansible/modules/dnf.py                    | 26 +++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 changelogs/fragments/73503_dnf_whatprovides.yml

diff --git a/changelogs/fragments/73503_dnf_whatprovides.yml b/changelogs/fragments/73503_dnf_whatprovides.yml
new file mode 100644
index 00000000000..e999274f7cb
--- /dev/null
+++ b/changelogs/fragments/73503_dnf_whatprovides.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- dnf - refactor code to use `dnf whatprovides` API (https://github.com/ansible/ansible/issues/73503).
diff --git a/lib/ansible/modules/dnf.py b/lib/ansible/modules/dnf.py
index 0342bac60b1..237b4439650 100644
--- a/lib/ansible/modules/dnf.py
+++ b/lib/ansible/modules/dnf.py
@@ -26,6 +26,8 @@ options:
         You can also pass a url or a local path to a rpm file.
         To operate on several packages this can accept a comma separated string of packages or a list of packages."
       - Comparison operators for package version are valid here C(>), C(<), C(>=), C(<=). Example - C(name>=1.0)
+      - You can also pass an absolute path for a binary which is provided by the package to install.
+        See examples for more information.
     required: true
     aliases:
         - pkg
@@ -295,6 +297,11 @@ EXAMPLES = '''
     name: /usr/local/src/nginx-release-centos-6-0.el6.ngx.noarch.rpm
     state: present
 
+- name: Install Package based upon the file it provides
+  dnf:
+    name: /usr/bin/cowsay
+    state: present
+
 - name: Install the 'Development tools' package group
   dnf:
     name: '@Development tools'
@@ -810,8 +817,12 @@ class DnfModule(YumDnf):
                 }
 
     def _whatprovides(self, filepath):
+        self.base.read_all_repos()
         available = self.base.sack.query().available()
-        pkg_spec = available.filter(provides=filepath).run()
+        # Search in file
+        files_filter = available.filter(file=filepath)
+        # And Search in provides
+        pkg_spec = files_filter.union(available.filter(provides=filepath)).run()
 
         if pkg_spec:
             return pkg_spec[0].name
@@ -826,14 +837,13 @@ class DnfModule(YumDnf):
                 filenames.append(name)
             elif name.endswith(".rpm"):
                 filenames.append(name)
-            elif name.startswith("@") or ('/' in name):
+            elif name.startswith('/'):
                 # like "dnf install /usr/bin/vi"
-                if '/' in name:
-                    pkg_spec = self._whatprovides(name)
-                    if pkg_spec:
-                        pkg_specs.append(pkg_spec)
-                        continue
-
+                pkg_spec = self._whatprovides(name)
+                if pkg_spec:
+                    pkg_specs.append(pkg_spec)
+                    continue
+            elif name.startswith("@") or ('/' in name):
                 if not already_loaded_comps:
                     self.base.read_comps()
                     already_loaded_comps = True