diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-09-10 08:00:18 +0000 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-09-18 13:41:56 -0500 |
| commit | 853468cad5cc17823b815cf355fc04026dcb3f8c (patch) | |
| tree | 651548676ebe1d09beb7d3856c6f262c0fa65da2 | |
| parent | c1db119a5a85ff51d7dee976a937115450f5179c (diff) | |
| download | bundler-853468cad5cc17823b815cf355fc04026dcb3f8c.tar.gz | |
Auto merge of #6015 - olleolleolle:fix/6013-rb_user_install_into_preserve_keys, r=segiddins
Add RB_USER_INSTALL to preserved ENV keys
This PR adds the environment variable `RB_USER_INSTALL` to the list of preserved keys. That variable is used on FreeBSD.
- see #6013
Without this change, Bundler's usage of it with the shared helpers to set a preserved env would raise this:
> ArgumentError: new key RB_USER_INSTALL
(This seems to be the only env var which is used but not listed in the preserved keys list.)
(cherry picked from commit b3cbf4a7538ca1d506a81706171b81c173bd048c)
| -rw-r--r-- | lib/bundler/environment_preserver.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bundler/environment_preserver.rb b/lib/bundler/environment_preserver.rb index 5a3e6c5785..af7c1ef0a4 100644 --- a/lib/bundler/environment_preserver.rb +++ b/lib/bundler/environment_preserver.rb @@ -12,6 +12,7 @@ module Bundler GEM_PATH MANPATH PATH + RB_USER_INSTALL RUBYLIB RUBYOPT ].map(&:freeze).freeze |