summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-01-31 20:25:49 -0600
committerSamuel Giddins <segiddins@segiddins.me>2016-01-31 20:25:49 -0600
commit6f2e4461f7addaf1044df7ed87b2f1ad7092a35d (patch)
tree083ee2d6bf9fb3bfc0a369304e9423a2dabdd578
parent844c093e95263aaff7a6edeb23035b1707ad17f3 (diff)
downloadbundler-seg-preserve-path.tar.gz
[PathPreserver] Use the passed-in envseg-preserve-path
-rw-r--r--lib/bundler/path_preserver.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/bundler/path_preserver.rb b/lib/bundler/path_preserver.rb
index 8d83cd9077..c37d7aa087 100644
--- a/lib/bundler/path_preserver.rb
+++ b/lib/bundler/path_preserver.rb
@@ -1,11 +1,11 @@
module Bundler
module PathPreserver
- def self.preserve_path_in_environment(env_var, env = ENV)
+ def self.preserve_path_in_environment(env_var, env)
original_env_var = "_ORIGINAL_#{env_var}"
- original_path = ENV[original_env_var]
- path = ENV[env_var]
- ENV[original_env_var] = path if original_path.nil? || original_path.empty?
- ENV[env_var] = original_path if path.nil? || path.empty?
+ original_path = env[original_env_var]
+ path = env[env_var]
+ env[original_env_var] = path if original_path.nil? || original_path.empty?
+ env[env_var] = original_path if path.nil? || path.empty?
end
end
end