upstream/vagrant
1
0
Fork 0
mirror of https://github.com/hashicorp/vagrant.git synced 2026-06-09 00:32:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

kernel/v2: provider configs do proper merge logic for config

Browse source
This commit is contained in:
Mitchell Hashimoto 2014-04-18 20:36:29 -07:00
parent 8171471628
commit bad6537e86
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/kernel_v2/config/vm.rb
View file

@ -379,11 +379,13 @@ module VagrantPlugins
config_class ||= Vagrant::Config::V2::DummyConfig
# Load it up
config = config_class.new
config = config_class.new
begin
blocks.each do |b|
b.call(config, Vagrant::Config::V2::DummyConfig.new)
new_config = config_class.new
b.call(new_config, Vagrant::Config::V2::DummyConfig.new)
config = config.merge(new_config)
end
rescue Exception => e
raise Vagrant::Errors::VagrantfileLoadError,