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

Restore the original environment from Bundler and the installer if given

This commit is contained in:
Seth Vargo 2015-07-09 12:36:57 -06:00
parent d8d5a66fa5
commit 3ba10b43ab
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vagrant/util/subprocess.rb
View File

@ -91,6 +91,15 @@ module Vagrant
end end
end end
# Reset the Bundler environment back - this is required for anyone who
# is not using the official Vagrant installers and is running Vagrant
# via bundler
if defined?(Bundler::ORIGINAL_ENV)
Bundler::ORIGINAL_ENV.each do |k, v|
process.environment[k] = v
end
end
# Set the environment on the process if we must # Set the environment on the process if we must
if @options[:env] if @options[:env]
@options[:env].each do |k, v| @options[:env].each do |k, v|