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

Don't load plugins again on `vagrant plugin` commands

This commit is contained in:
Mitchell Hashimoto 2014-01-05 16:04:53 -08:00
parent 8823f43f3a
commit 76de267d1e
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bin/vagrant
View File

@ -39,6 +39,21 @@ if argv.include?("--debug")
ENV["VAGRANT_LOG"] = "debug" ENV["VAGRANT_LOG"] = "debug"
end end
# This is kind of hacky, and I'd love to find a better way to do this, but
# if we're accessing the plugin interface, we want to NOT load plugins
# for this run, because they can actually interfere with the function
# of the plugin interface.
argv.each do |arg|
if !arg.start_with?("-")
if arg == "plugin"
ENV["VAGRANT_NO_PLUGINS"] = "1"
ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}"
end
break
end
end
# Setup our dependencies by initializing Bundler # Setup our dependencies by initializing Bundler
require "bundler" require "bundler"
Bundler.setup Bundler.setup
@ -95,21 +110,6 @@ end
# Default to colored output # Default to colored output
opts[:ui_class] ||= Vagrant::UI::Colored opts[:ui_class] ||= Vagrant::UI::Colored
# This is kind of hacky, and I'd love to find a better way to do this, but
# if we're accessing the plugin interface, we want to NOT load plugins
# for this run, because they can actually interfere with the function
# of the plugin interface.
argv.each do |arg|
if !arg.start_with?("-")
if arg == "plugin"
ENV["VAGRANT_NO_PLUGINS"] = "1"
ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}"
end
break
end
end
# Recombine the arguments # Recombine the arguments
argv << "--" argv << "--"
argv += argv_extra argv += argv_extra