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

core: use env var for bundle retries [GH-6705]

This commit is contained in:
Mitchell Hashimoto 2015-12-24 12:16:12 -08:00
parent 05c2d439ac
commit 0de44a116b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
BUG FIXES: BUG FIXES:
- core: Don't create ".bundle" directory in pwd [GH-6717]
- core: Fix exception on installing VirtualBox [GH-6713] - core: Fix exception on installing VirtualBox [GH-6713]
- guests/debian: Fix Docker install [GH-6722] - guests/debian: Fix Docker install [GH-6722]
- provisioners/chef: convert chef version to a string before comparing for - provisioners/chef: convert chef version to a string before comparing for

4
lib/vagrant/bundler.rb
View File

@ -43,9 +43,6 @@ module Vagrant
yield yield
end end
end end
# Configure Bundler to retry
::Bundler.settings[:retry] = 3
end end
# Initializes Bundler and the various gem paths so that we can begin # Initializes Bundler and the various gem paths so that we can begin
@ -77,6 +74,7 @@ module Vagrant
env["BUNDLE_APP_CONFIG"] = @appconfigpath env["BUNDLE_APP_CONFIG"] = @appconfigpath
env["BUNDLE_CONFIG"] = @configfile.path env["BUNDLE_CONFIG"] = @configfile.path
env["BUNDLE_GEMFILE"] = @gemfile.path env["BUNDLE_GEMFILE"] = @gemfile.path
env["BUNDLE_RETRY"] = "3"
env["GEM_PATH"] = env["GEM_PATH"] =
"#{bundle_path}#{::File::PATH_SEPARATOR}#{@gem_path}" "#{bundle_path}#{::File::PATH_SEPARATOR}#{@gem_path}"
end end