rhel7 / dnf 2.0 fixes / improved errors

- fixes for dnf 2.0 / rhel7
- improved error messages from python helper (gives python stack
  traces instead of just EPIPE all the time)
- improved which/where interface in the which mixin.

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

1 files changed, 19 insertions, 7 deletions

diff --git a/lib/chef/mixin/which.rb b/lib/chef/mixin/which.rb
index 4fa79eeccb..92934ce485 100644
--- a/lib/chef/mixin/which.rb
+++ b/lib/chef/mixin/which.rb
@@ -18,15 +18,27 @@
 class Chef
   module Mixin
     module Which
-      def which(cmd, extra_path: nil)
+      def which(*cmds, extra_path: nil, &block)
+        where(*cmds, extra_path: extra_path, &block).first
+      end
+
+      def where(*cmds, extra_path: nil, &block)
         # NOTE: unnecessarily duplicates function of path_sanity
         extra_path ||= [ "/bin", "/usr/bin", "/sbin", "/usr/sbin" ]
-        paths = ENV["PATH"].split(File::PATH_SEPARATOR) + extra_path
-        paths.each do |path|
-          filename = Chef.path_to(File.join(path, cmd))
-          return filename if File.executable?(filename)
-        end
-        false
+        cmds.map do |cmd|
+          paths = ENV["PATH"].split(File::PATH_SEPARATOR) + extra_path
+          paths.map do |path|
+            filename = Chef.path_to(File.join(path, cmd))
+            filename if valid_executable?(filename, &block)
+          end.compact
+        end.flatten
+      end
+
+      private
+
+      def valid_executable?(filename, &block)
+        return false unless File.executable?(filename) && !File.directory?(filename)
+        block ? yield(filename) : true
       end
     end
   end