From 0de44a116bec833500b0b193428e03b32779691b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 24 Dec 2015 12:16:12 -0800
Subject: [PATCH] core: use env var for bundle retries [GH-6705]

---
 CHANGELOG.md           | 1 +
 lib/vagrant/bundler.rb | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62e928e84..9700a4063 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 BUG FIXES:
 
+  - core: Don't create ".bundle" directory in pwd [GH-6717]
   - core: Fix exception on installing VirtualBox [GH-6713]
   - guests/debian: Fix Docker install [GH-6722]
   - provisioners/chef: convert chef version to a string before comparing for
diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
index fe9699ef4..ff60b327b 100644
--- a/lib/vagrant/bundler.rb
+++ b/lib/vagrant/bundler.rb
@@ -43,9 +43,6 @@ module Vagrant
           yield
         end
       end
-
-      # Configure Bundler to retry
-      ::Bundler.settings[:retry] = 3
     end
 
     # 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_CONFIG"]     = @configfile.path
         env["BUNDLE_GEMFILE"]    = @gemfile.path
+        env["BUNDLE_RETRY"]      = "3"
         env["GEM_PATH"] =
           "#{bundle_path}#{::File::PATH_SEPARATOR}#{@gem_path}"
       end