Ticket #6547: really_fix_capistrano_username_and_ports_patch.diff
| File really_fix_capistrano_username_and_ports_patch.diff, 1.6 kB (added by ezmobius, 2 years ago) |
|---|
-
lib/capistrano/ssh.rb
old new 28 28 :port => port, 29 29 :auth_methods => methods.shift }.merge(config.ssh_options) 30 30 31 user, server , port = parse_server(server)31 user, server_stripped, port = parse_server(server) 32 32 ssh_options[:username] = user if user 33 33 ssh_options[:port] = port if port 34 34 35 Net::SSH.start(server ,ssh_options,&block)35 Net::SSH.start(server_stripped,ssh_options,&block) 36 36 rescue Net::SSH::AuthenticationFailed 37 37 raise if methods.empty? 38 38 password_value = config.password -
lib/capistrano/gateway.rb
old new 73 73 74 74 thread = Thread.new do 75 75 begin 76 user, server , port = SSH.parse_server(server)76 user, server_stripped, port = SSH.parse_server(server) 77 77 @config.ssh_options[:username] = user if user 78 78 remote_port = port || 22 79 @session.forward.local(local_port, server , remote_port)79 @session.forward.local(local_port, server_stripped, remote_port) 80 80 connection = SSH.connect('127.0.0.1', @config, local_port) 81 81 @config.logger.trace "connection to #{server} via gateway established" 82 82 rescue Errno::EADDRINUSE
