summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-11-30 09:53:38 -0800
committerGitHub <noreply@github.com>2018-11-30 09:53:38 -0800
commit6871b91df7c1c2cbaf1e0dfff8d567d701a49a45 (patch)
tree412940b17166dcfe4325159e93f3c45951de9f0d
parent2daf2d47aad38b8f8ddfdce47868ca7d95ea0949 (diff)
parent6150fdea14946067da2964819b861b6870b60e3e (diff)
downloadchef-6871b91df7c1c2cbaf1e0dfff8d567d701a49a45.tar.gz
Merge pull request #8003 from pixdrift/master
package resource: Add RHEL 8 support to DNF package installer
-rw-r--r--lib/chef/provider/package/dnf/python_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/provider/package/dnf/python_helper.rb b/lib/chef/provider/package/dnf/python_helper.rb
index b3593f6efd..56706764d0 100644
--- a/lib/chef/provider/package/dnf/python_helper.rb
+++ b/lib/chef/provider/package/dnf/python_helper.rb
@@ -37,7 +37,8 @@ class Chef
DNF_HELPER = ::File.expand_path(::File.join(::File.dirname(__FILE__), "dnf_helper.py")).freeze
def dnf_command
- @dnf_command ||= which("python", "python3", "python2", "python2.7") do |f|
+ # platform-python is used for system tools on RHEL 8 and is installed under /usr/libexec
+ @dnf_command ||= which("platform-python", "python", "python3", "python2", "python2.7", extra_path: "/usr/libexec") do |f|
shell_out("#{f} -c 'import dnf'").exitstatus == 0
end + " #{DNF_HELPER}"
end