change file_staging_uses_destdir default to true

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/chef/file_content_management/tempfile.rb b/lib/chef/file_content_management/tempfile.rb
index 0bb7f3a6fa..61a5ce2a7c 100644
--- a/lib/chef/file_content_management/tempfile.rb
+++ b/lib/chef/file_content_management/tempfile.rb
@@ -54,7 +54,14 @@ class Chef
       end
 
       def tempfile_dirname
-        Chef::Config[:file_staging_uses_destdir] ? ::File.dirname(@new_resource.path) : Dir::tmpdir
+        # in why-run mode we need to create a Tempfile to compare against, which we will never
+        # wind up deploying, but our enclosing directory for the destdir may not exist yet, so
+        # instead we can reliably always create a Tempfile to compare against in Dir::tmpdir
+        if Chef::Config[:file_staging_uses_destdir] && !Chef::Config[:why_run]
+          ::File.dirname(@new_resource.path)
+        else
+          Dir::tmpdir
+        end
       end
     end
   end