public
Description: Remote multi-server automation tool
Homepage: http://www.capify.org
Clone URL: git://github.com/jamis/capistrano.git
Search Repo:
a bit of prettying and removing redundant dups
jamis (author)
Sat Apr 12 20:39:15 -0700 2008
commit  b1e465fb15547577bba66354ae8fa70a79a3cde8
tree    92323d7b463a83148b60610bd06fe0f5a5eba003
parent  c0606ca85a0c5983b34f32df2227829ef972f376
...
43
44
45
46
 
47
48
49
...
43
44
45
 
46
47
48
49
0
@@ -43,7 +43,7 @@ module Capistrano
0
       methods = [ %w(publickey hostbased), %w(password keyboard-interactive) ]
0
       password_value = nil
0
 
0
- ssh_options = (server.options[:ssh_options] || {}).dup.merge(options[:ssh_options] || {}).dup
0
+ ssh_options = (server.options[:ssh_options] || {}).merge(options[:ssh_options] || {})
0
       user = server.user || options[:user] || ssh_options[:username] || ServerDefinition.default_user
0
       ssh_options[:port] = server.port || options[:port] || ssh_options[:port] || DEFAULT_PORT
0
 

Comments

    No one has commented yet.