0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Don't retry failed connections if an explicit auth_methods list is given [Chris Farms]
0
+
0
 * Added support for load and exit callbacks, which get invoked when all recipes have been loaded and when all requested tasks have been executed [Jamis Buck]
0
 
0
 * Added support for start and finish callbacks, which get invoked when any task is called via the command-line [Jamis Buck]

0
@@ -52,7 +52,7 @@ module Capistrano
0
         Server.apply_to(connection, server)
0
 
0
       rescue Net::SSH::AuthenticationFailed
0
-        raise if methods.empty?
0
+        raise if methods.empty? || options[:ssh_options] && options[:ssh_options][:auth_methods]
0
         password_value = options[:password]
0
         retry
0
       end

0
@@ -83,4 +83,9 @@ class SSHTest < Test::Unit::TestCase
0
     assert success.respond_to?(:xserver)
0
     assert_equal success.xserver, @server
0
   end
0
+
0
+  def test_connect_should_not_retry_if_custom_auth_methods_are_given
0
+    Net::SSH.expects(:start).with(@server.host, @options.merge(:auth_methods => %w(publickey))).raises(Net::SSH::AuthenticationFailed)
0
+    assert_raises(Net::SSH::AuthenticationFailed) { Capistrano::SSH.connect(@server, :ssh_options => { :auth_methods => %w(publickey) }) }
0
+  end
0
 end