Fixing CHEF-185: action_delete does not backup symlinks

Author: chris

chef/lib/chef/provider/file.rb

@@ -140,7 +140,7 @@ def action_create_if_missing
 
       def action_delete
         if ::File.exists?(@new_resource.path) && ::File.writable?(@new_resource.path)
-          backup
+          backup unless ::File.symlink?(@new_resource.path)
           Chef::Log.info("Deleting #{@new_resource} at #{@new_resource.path}")
           ::File.delete(@new_resource.path)
           @new_resource.updated = true

chef/spec/unit/provider/file_spec.rb

@@ -65,6 +65,22 @@
     provider.current_resource.group.should eql(nil)
     provider.current_resource.mode.should eql(nil)
   end
+
+  it "should not backup symbolic links on delete" do
+    path = File.join(File.dirname(__FILE__), "..", "..", "data", "detroit.txt")
+    ::File.open(path, "w") do |file|
+      file.write("Detroit's not so nice, so you should come to Seattle instead and buy me a beer instead.")
+    end
+    @resource = Chef::Resource::File.new("detroit")
+    @resource.path(path)
+    @node = Chef::Node.new
+    @node.name "latte"
+    @provider = Chef::Provider::File.new(@node, @resource)
+
+    ::File.stub!(:symlink?).and_return(true)
+    @provider.should_not_receive(:backup)
+    @provider.action_delete
+  end
 
   it "should load the correct value for owner of the current resource" do
     stats = File.stat(@resource.path)
@@ -236,4 +252,4 @@
     @provider.should_receive(:action_create).and_return(true)
     @provider.action_create_if_missing
   end
-end
+end