core: Force bundler usage if in Installer

2014-02-02 20:32:39 +01:00 · 2014-02-02 20:32:39 +01:00 · 07389f26ed
parent 6ec71d4a85
commit 07389f26ed
1 changed files with 3 additions and 2 deletions
--- a/lib/vagrant/bundler.rb
+++ b/lib/vagrant/bundler.rb
@ -18,8 +18,9 @@ module Vagrant
    end

    def initialize
-      @enabled  = !::Bundler::SharedHelpers.in_bundle?
-      @enabled  = true if ENV["VAGRANT_FORCE_BUNDLER"]
+      @enabled = true if ENV["VAGRANT_INSTALLER_ENV"] ||
+        ENV["VAGRANT_FORCE_BUNDLER"]
+      @enabled  = !::Bundler::SharedHelpers.in_bundle? if !@enabled
      @monitor  = Monitor.new

      @gem_home = ENV["GEM_HOME"]