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

core: rescue version conflicts when setting up Bundler

This commit is contained in:
Mitchell Hashimoto 2014-03-05 13:16:46 -08:00
parent 7f2fe524b3
commit ba52c31bbf
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/vagrant
View File

@ -57,7 +57,16 @@ end
# 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.
require "bundler" require "bundler"
Bundler.setup(:default, :plugins) begin
Bundler.setup(:default, :plugins)
rescue Bundler::VersionConflict
$stderr.puts "Vagrant experienced a version conflict with some installed plugins!"
$stderr.puts "To fix this error, please update or remove the plugins which are"
$stderr.puts "conflicting, and report this issue to the plugin creator. The conflict"
$stderr.puts "is shown below:\n\n"
$stderr.puts e.message
exit 1
end
# Stdout/stderr should not buffer output # Stdout/stderr should not buffer output
$stdout.sync = true $stdout.sync = true