lib/puppet/util/diff.rb in puppet-2.7.11 vs lib/puppet/util/diff.rb in puppet-2.7.12

@@ -2,10 +2,12 @@
 module Puppet::Util::Diff
   include Puppet::Util
   require 'tempfile'
 
   def diff(old, new)
-    command = [Puppet[:diff]]
+    return '' unless diff_cmd = Puppet[:diff] and diff_cmd != ""
+
+    command = [diff_cmd]
     if args = Puppet[:diff_args] and args != ""
       command << args
     end
     command << old << new
     execute(command, :failonfail => false)