kernel/v2: provider configs do proper merge logic for config
This commit is contained in:
parent
8171471628
commit
bad6537e86
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue