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

Always setup plugins, but just don't always require them

This commit is contained in:
Mitchell Hashimoto 2014-01-05 16:49:25 -08:00
parent f7e4c4df6b
commit 36f64db874
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/vagrant
View File

@ -59,10 +59,8 @@ require "vagrant/shared_helpers"
# Setup our dependencies by initializing Bundler. If we're using plugins, # Setup our dependencies by initializing Bundler. If we're using plugins,
# then also initialize the paths to the plugins. # then also initialize the paths to the plugins.
groups = [:default]
groups << :plugins if Vagrant.plugins_enabled?
require "bundler" require "bundler"
Bundler.setup(*groups) Bundler.setup
require 'log4r' require 'log4r'
require 'vagrant' require 'vagrant'

3
lib/vagrant/pre-rubygems.rb
View File

@ -16,8 +16,7 @@ require_relative "bundler"
require_relative "plugin/manager" require_relative "plugin/manager"
require_relative "shared_helpers" require_relative "shared_helpers"
plugins = [] plugins = Vagrant::Plugin::Manager.instance.installed_plugins
plugins = Vagrant::Plugin::Manager.instance.installed_plugins if Vagrant.plugins_enabled?
Vagrant::Bundler.instance.init!(plugins) Vagrant::Bundler.instance.init!(plugins)
ENV["VAGRANT_INTERNAL_BUNDLERIZED"] = "1" ENV["VAGRANT_INTERNAL_BUNDLERIZED"] = "1"