haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7587 from alexmv/disabled-conflicts 

Skip checking for conflicts on ports that are disabled
This commit is contained in:
Seth Vargo 2016-07-18 21:55:33 -04:00 committed by GitHub
parent 57f40f1e0a 3d2fde9260
commit 8f10dbca90
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
View File

@ -93,6 +93,11 @@ module Vagrant
guest_port = options[:guest] guest_port = options[:guest]
host_port = options[:host] host_port = options[:host]
if options[:disabled]
@logger.debug("Skipping disabled port #{host_port}.")
next
end
if options[:protocol] && options[:protocol] != "tcp" if options[:protocol] && options[:protocol] != "tcp"
@logger.debug("Skipping #{host_port} because UDP protocol.") @logger.debug("Skipping #{host_port} because UDP protocol.")
next next