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

Remove dependence on V1 Kernel from Environment

This commit is contained in:
Mitchell Hashimoto 2012-06-14 18:46:48 -07:00
parent 922a5aade5
commit 51be92eeb6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vagrant/config/v1.rb
View File

@ -76,6 +76,10 @@ module Vagrant
# Get all the registered plugins # Get all the registered plugins
config_map = {} config_map = {}
Vagrant.plugin("1").registered.each do |plugin| Vagrant.plugin("1").registered.each do |plugin|
# Activate the plugin since we're about to use it
plugin.activate!
# Get all the available configuration keys and add them to the map
plugin.config.each do |key, klass| plugin.config.each do |key, klass|
config_map[key] = klass config_map[key] = klass
end end

2
lib/vagrant/environment.rb
View File

@ -422,7 +422,7 @@ module Vagrant
# to simply be our configuration. # to simply be our configuration.
if defined_vm_keys.empty? if defined_vm_keys.empty?
defined_vm_keys << DEFAULT_VM defined_vm_keys << DEFAULT_VM
defined_vms[DEFAULT_VM] = VagrantPlugins::Kernel::VagrantConfigSubVM.new defined_vms[DEFAULT_VM] = nil
end end
vm_configs = defined_vm_keys.map do |vm_name| vm_configs = defined_vm_keys.map do |vm_name|