support apps with changed git urls

ezmobius · Sep 16, 2009 · f98946b · f98946b
1 parent a856ea2
commit f98946b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/chef-deploy/cached_deploy.rb b/lib/chef-deploy/cached_deploy.rb
@@ -247,7 +247,8 @@ def repository_cache
     end
 
     def update_repository_cache
-      command = "if [ -d #{repository_cache} ]; then " +
+      command = "if [ -d #{repository_cache} ] &&" +
+        "git --git-dir #{repository_cache}/.git/ remote -v | grep -q #{configuration[:repository]}; then " +
         "#{source.sync(revision, repository_cache)}; " +
         "else #{source.checkout(revision, repository_cache)}; fi"
       command

diff --git a/lib/chef-deploy/git.rb b/lib/chef-deploy/git.rb
@@ -32,6 +32,9 @@ def checkout(revision, destination)
     end
 
     execute = []
+
+    execute << "rm -rf #{destination}"
+
     if args.empty?
       execute << "#{git} clone #{verbose} #{configuration[:repository]} #{destination}"
     else