Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Moved run_symlinks_before_migrate inside of migrate attribute conditi…

…onal. This fix enables migrating non rails and merb apps by not symlinking the config directory if migrate is set to false in the deploy resource.
  • Loading branch information...
commit 050f64e6a4ce59511f80006da9d47d7df4ee2dbd 1 parent 9308b58
P. Barrett Little authored
View
3  chef/lib/chef/provider/deploy.rb
@@ -143,10 +143,9 @@ def callback(what, callback_code=nil)
end
def migrate
- run_symlinks_before_migrate
-
if @new_resource.migrate
enforce_ownership
+ run_symlinks_before_migrate
environment = @new_resource.environment
env_info = environment && environment.map do |key_and_val|
View
2  chef/spec/unit/provider/deploy_spec.rb
@@ -218,7 +218,7 @@
it "skips the migration when resource.migrate => false but runs symlinks before migration" do
@resource.migrate false
@provider.should_not_receive :run_command
- @provider.should_receive :run_symlinks_before_migrate
+ @provider.should_not_receive :run_symlinks_before_migrate
@provider.migrate
end
Please sign in to comment.
Something went wrong with that request. Please try again.