From 79fa7000fa4ec29c5f3b8c56362dddc80090e4b2 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 20 Sep 2013 17:57:44 -0700 Subject: [PATCH] providers/virtualbox: don't touch DYLD_* anymore. Subprocess handles this --- plugins/providers/virtualbox/driver/base.rb | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/plugins/providers/virtualbox/driver/base.rb b/plugins/providers/virtualbox/driver/base.rb index 468834597..3812cfb8d 100644 --- a/plugins/providers/virtualbox/driver/base.rb +++ b/plugins/providers/virtualbox/driver/base.rb @@ -347,26 +347,9 @@ module VagrantPlugins # Append in the options for subprocess command << { :notify => [:stdout, :stderr] } - # The following is a workaround for a combined VirtualBox and - # Mac OS X 10.8 bug: - # - # Remove the DYLD_LIBRARY_PATH environmental variable on Mac. This - # is to fix a bug in Mac OS X 10.8 where a warning is printed to the - # console if this is set when executing certain programs, which - # can cause some VBoxManage commands to break because they work - # by just reading stdout and don't expect the OS to just inject - # garbage into it. - old_dyld_lib_path = ENV.delete("DYLD_LIBRARY_PATH") - old_ld_lib_path = ENV.delete("LD_LIBRARY_PATH") - Vagrant::Util::Busy.busy(int_callback) do Vagrant::Util::Subprocess.execute(@vboxmanage_path, *command, &block) end - ensure - # Reset the library path if it was set before. See above comments - # for more information on why this was unset in the first place. - ENV["DYLD_LIBRARY_PATH"] = old_dyld_lib_path if old_dyld_lib_path - ENV["LD_LIBRARY_PATH"] = old_ld_lib_path if old_ld_lib_path end end end