kotovalexarian-likes-github/capistrano
1
0
Fork 0
mirror of https://github.com/capistrano/capistrano synced 2023-03-27 23:21:18 -04:00
Code Releases Activity

Fix matching on hosts with custom ports or users set

Browse source 
This is an update of PR #1072 with passing tests
Thanks @cheald

Fixes #1071
Closes #1072
This commit is contained in:
Shane O'Grady 2014-10-16 18:56:33 -03:00
parent 121f884583
commit a598601b60
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@ Reverse Chronological Order:
https://github.com/capistrano/capistrano/compare/v3.2.1...HEAD
* Enhancements (@townsen)
* Fix matching on hosts with custom ports or users set
* Previously filtering would affect any generated configuration files so that
files newly deployed would not be the same as those on the hosts previously
deployed (and now excluded by filters). This is almost certainly not what is

7
lib/capistrano/configuration/servers.rb
View file

@ -8,7 +8,7 @@ module Capistrano
include Enumerable
def add_host(host, properties={})
servers.add server(host).with(properties)
servers.add server(host, properties).with(properties)
end
def add_role(role, hosts, options={})
@ -33,8 +33,9 @@ module Capistrano
private
def server(host)
servers.find { |server| server.matches? Server[host] } || Server[host]
def server(host, properties)
new_host = Server[host].with(properties)
servers.find { |server| server.matches? new_host } || new_host
end
def servers