Fixed CHEF-3564 so that remote_directory

is not longer updated_by_last_action on every run by only putting converge_by blocks in places where remote_dir would directly execute code.

1 files changed, 10 insertions, 14 deletions

diff --git a/lib/chef/provider/remote_directory.rb b/lib/chef/provider/remote_directory.rb
index dee383f763..5b6348980c 100644
--- a/lib/chef/provider/remote_directory.rb
+++ b/lib/chef/provider/remote_directory.rb
@@ -39,22 +39,18 @@ class Chef
                                    name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
                                  end)
 
-        converge_by("Create managed files in directory") do
-          files_to_transfer.each do |cookbook_file_relative_path|
-            create_cookbook_file(cookbook_file_relative_path)
-            # the file is removed from the purge list
-            files_to_purge.delete(::File.join(@new_resource.path, cookbook_file_relative_path))
-            # parent directories are also removed from the purge list
-            directories=::File.dirname(::File.join(@new_resource.path, cookbook_file_relative_path)).split(::File::SEPARATOR)
-            for i in 0..directories.length-1
-              files_to_purge.delete(::File.join(directories[0..i]))
-            end
-          end
-        end
 
-        converge_by("Purge unmanaged files from directory") do
-          purge_unmanaged_files(files_to_purge)
+        files_to_transfer.each do |cookbook_file_relative_path|
+          create_cookbook_file(cookbook_file_relative_path)
+          # the file is removed from the purge list
+          files_to_purge.delete(::File.join(@new_resource.path, cookbook_file_relative_path))
+          # parent directories are also removed from the purge list
+          directories=::File.dirname(::File.join(@new_resource.path, cookbook_file_relative_path)).split(::File::SEPARATOR)
+          for i in 0..directories.length-1
+            files_to_purge.delete(::File.join(directories[0..i]))
+          end
         end
+        purge_unmanaged_files(files_to_purge)
       end
 
       def action_create_if_missing