From c20e16029587e7ede0e4b448834da625e0761a52 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Wed, 7 Dec 2016 06:00:56 -0800 Subject: [PATCH] Remove direct bundler usage within Env util --- lib/vagrant/util/env.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/vagrant/util/env.rb b/lib/vagrant/util/env.rb index 6a8714e54..dc8ed9f9f 100644 --- a/lib/vagrant/util/env.rb +++ b/lib/vagrant/util/env.rb @@ -1,5 +1,3 @@ -require "bundler" - module Vagrant module Util class Env @@ -39,7 +37,9 @@ module Vagrant # the block to execute with the cleaned environment def self.with_clean_env with_original_env do - ENV["MANPATH"] = ENV["BUNDLE_ORIG_MANPATH"] + if ENV["BUNDLE_ORIG_MANPATH"] + ENV["MANPATH"] = ENV["BUNDLE_ORIG_MANPATH"] + end ENV.delete_if { |k,_| k[0,7] == "BUNDLE_" } if ENV.has_key? "RUBYOPT" ENV["RUBYOPT"] = ENV["RUBYOPT"].sub("-rbundler/setup", "")