diff options
author | Lamont Granquist <lamont@opscode.com> | 2012-08-29 10:51:58 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@opscode.com> | 2012-08-29 10:51:58 -0700 |
commit | 09ab8766efd86156bb528852cfca393104e7a455 (patch) | |
tree | 995d7990ac595cf6458fdb276150bf3cefb5a45d | |
parent | d908e0b6d3d64c9b666d4986a77154f0b07e5b2d (diff) | |
download | chef-09ab8766efd86156bb528852cfca393104e7a455.tar.gz |
get the path out of the temptfile object
-rw-r--r-- | chef/lib/chef/provider/file.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chef/lib/chef/provider/file.rb b/chef/lib/chef/provider/file.rb index 0fa4894e10..5ffa7e74cf 100644 --- a/chef/lib/chef/provider/file.rb +++ b/chef/lib/chef/provider/file.rb @@ -75,7 +75,7 @@ class Chef @current_resource.path else suppress_resource_reporting = true # suppress big diffs going to resource reporting service - Tempfile.new('chef-tempfile') + Tempfile.new('chef-tempfile').path end diff_filesize_threshold = Chef::Config[:diff_filesize_threshold] @@ -91,6 +91,7 @@ class Chef begin # -u: Unified diff format + puts ("diff -u #{target_path} #{temp_path}" ) result = shell_out("diff -u #{target_path} #{temp_path}" ) rescue Exception => e # Should *not* receive this, but in some circumstances it seems that |