attempt redeploy of failed deployment

`deploy_revision` provider now stores releases in the release history
cache only after a successful deploy. As a result, a partially deployed
application will be overwritten by a subsequent deploy to the same
revision (similar to force_deploy).

Fixes CHEF-2741

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/chef/provider/deploy.rb b/lib/chef/provider/deploy.rb
index 2c915649a4..859a7da283 100644
--- a/lib/chef/provider/deploy.rb
+++ b/lib/chef/provider/deploy.rb
@@ -228,6 +228,10 @@ class Chef
       end
 
       def cleanup!
+        converge_by("update release history data") do
+          release_created(release_path)
+        end
+
         chop = -1 - @new_resource.keep_releases
         all_releases[0..chop].each do |old_release|
           converge_by("remove old release #{old_release}") do
@@ -263,10 +267,10 @@ class Chef
       def copy_cached_repo
         target_dir_path = @new_resource.deploy_to + "/releases"
         converge_by("deploy from repo to #{@target_dir_path} ") do
+          FileUtils.rm_rf(release_path) if ::File.exist?(release_path)
           FileUtils.mkdir_p(target_dir_path)
           FileUtils.cp_r(::File.join(@new_resource.destination, "."), release_path, :preserve => true)
           Chef::Log.info "#{@new_resource} copied the cached checkout to #{release_path}"
-          release_created(release_path)
         end
       end