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

Only run bundler initialization if plugin initialization is enabled

This commit is contained in:
Chris Roberts 2018-07-18 10:48:22 -07:00
parent 9d191a2419
commit c5a6790192
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vagrant/plugin/manager.rb
View File

@ -48,12 +48,7 @@ module Vagrant
# @return [Hash] list of plugins # @return [Hash] list of plugins
def globalize! def globalize!
@logger.debug("Enabling globalized plugins") @logger.debug("Enabling globalized plugins")
if !Vagrant.plugins_init? plugins = installed_plugins
@logger.warn("Plugin initialization is disabled")
return {}
end
plugins = Vagrant::Plugin::Manager.instance.installed_plugins
bundler_init(plugins) bundler_init(plugins)
plugins plugins
end end
@ -78,6 +73,11 @@ module Vagrant
# @param [Hash] plugins List of plugins # @param [Hash] plugins List of plugins
# @return [nil] # @return [nil]
def bundler_init(plugins) def bundler_init(plugins)
if !Vagrant.plugins_init?
@logger.warn("Plugin initialization is disabled")
return nil
end
@logger.info("Plugins:") @logger.info("Plugins:")
plugins.each do |plugin_name, plugin_info| plugins.each do |plugin_name, plugin_info|
installed_version = plugin_info["installed_gem_version"] installed_version = plugin_info["installed_gem_version"]