Allow execute_on_servers to be called without an active task again

git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@7176 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
halorgium · Jul 10, 2007 · d5708d7 · d5708d7
1 parent 36ced55
commit d5708d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Allow execute_on_servers to be called without a current task again [Jamis Buck]
+
 * Put $stdout in sync mode, so that Net::SSH prompts are displayed [Jamis Buck]
 
 * Make sure deploy:check aborts if it fails [Jamis Buck]

diff --git a/lib/capistrano/configuration/connections.rb b/lib/capistrano/configuration/connections.rb
@@ -115,7 +115,7 @@ def execute_on_servers(options={})
         begin
           establish_connections_to(servers)
         rescue ConnectionError => error
-          raise error unless task.continue_on_error?
+          raise error unless task && task.continue_on_error?
           error.hosts.each do |h|
             servers.delete(h)
             failed!(h)
@@ -125,7 +125,7 @@ def execute_on_servers(options={})
         begin
           yield servers
         rescue RemoteError => error
-          raise error unless task.continue_on_error?
+          raise error unless task && task.continue_on_error?
           error.hosts.each { |h| failed!(h) }
         end
       end