lib/cap_recipes/tasks/gitdeploy/setup.rb in crazycode-cap-recipes-0.4.9 vs lib/cap_recipes/tasks/gitdeploy/setup.rb in crazycode-cap-recipes-0.4.10

- old
+ new

@@ -58,10 +58,10 @@ tag_name = configuration[:tag] || configuration[:build_version] if tag_name.nil? raise "NO tag. pls use -s tag=xxx set tag_name" end - if war_config.nil? or war_config.size == 0 + if war_config.nil? or war_config.size == 0 or !defined? war_name raise 'NO war_config' end system "cd #{local_gitrepo}; git checkout #{branch}; git fetch; git merge origin/#{branch};"