diff options
| author | Daniel DeLeo <dan@opscode.com> | 2010-06-28 16:29:08 -0700 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2010-06-28 16:29:08 -0700 |
| commit | ba39367ac434f1804e19133a30343cbde76490cf (patch) | |
| tree | 7f169d155e7799d5e9bda38c7abb1323b183a3c8 | |
| parent | 726f6259f26b8035a859357d2464edaa931a0099 (diff) | |
| parent | 8aadef977e914d50c960c88426ffade145b91163 (diff) | |
| download | chef-ba39367ac434f1804e19133a30343cbde76490cf.tar.gz | |
Merge branch 'CHEF-1396'
| -rw-r--r-- | chef/lib/chef/provider/template.rb | 2 | ||||
| -rw-r--r-- | chef/spec/unit/run_list_spec.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chef/lib/chef/provider/template.rb b/chef/lib/chef/provider/template.rb index 256d56f8fc..bb3fa4137f 100644 --- a/chef/lib/chef/provider/template.rb +++ b/chef/lib/chef/provider/template.rb @@ -52,7 +52,7 @@ class Chef Chef::Log.info("Writing updated content for #{@new_resource} to #{@new_resource.path}") backup set_all_access_controls(rendered_template.path) - FileUtils.cp(rendered_template.path, @new_resource.path) + FileUtils.mv(rendered_template.path, @new_resource.path) @new_resource.updated = true end end diff --git a/chef/spec/unit/run_list_spec.rb b/chef/spec/unit/run_list_spec.rb index 106065190c..a5b50db157 100644 --- a/chef/spec/unit/run_list_spec.rb +++ b/chef/spec/unit/run_list_spec.rb @@ -140,7 +140,6 @@ describe Chef::RunList do @role.default_attributes :one => :two @role.override_attributes :three => :four - Chef::Role.stub!(:from_disk).and_return(@role) Chef::Role.stub!(:load).and_return(@role) @rest = mock("Chef::REST", { :get_rest => @role, :url => "/" }) Chef::REST.stub!(:new).and_return(@rest) |