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

Set options directly instead of lazy merging

This commit is contained in:
Chris Roberts 2018-07-18 15:47:35 -07:00
parent 0a3d40bd33
commit ab39125570
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/vagrant/environment.rb
View File

@ -8,6 +8,7 @@ require 'log4r'
require 'vagrant/util/file_mode' require 'vagrant/util/file_mode'
require 'vagrant/util/platform' require 'vagrant/util/platform'
require 'vagrant/util/hash_with_indifferent_access'
require "vagrant/util/silence_warnings" require "vagrant/util/silence_warnings"
require "vagrant/vagrantfile" require "vagrant/vagrantfile"
require "vagrant/version" require "vagrant/version"
@ -950,10 +951,16 @@ module Vagrant
end end
end end
needs_install.each do |name| needs_install.each do |name|
pconfig = Util::HashWithIndifferentAccess.new(config_plugins[name])
ui.info(I18n.t("vagrant.commands.plugin.installing", name: name)) ui.info(I18n.t("vagrant.commands.plugin.installing", name: name))
spec = Plugin::Manager.instance.install_plugin(name,
{sources: Vagrant::Bundler::DEFAULT_GEM_SOURCES.dup}.merge( options = {sources: Vagrant::Bundler::DEFAULT_GEM_SOURCES.dup, env_local: true}
config_plugins[name]).merge(env_local: true)) options[:sources] = pconfig[:sources] if pconfig[:sources]
options[:require] = pconfig[:entry_point] if pconfig[:entry_point]
options[:version] = pconfig[:version] if pconfig[:version]
spec = Plugin::Manager.instance.install_plugin(name, options)
ui.info(I18n.t("vagrant.commands.plugin.installed", ui.info(I18n.t("vagrant.commands.plugin.installed",
name: spec.name, version: spec.version.to_s)) name: spec.name, version: spec.version.to_s))
end end