summaryrefslogtreecommitdiff
path: root/lib/rubygems/config_file.rb
diff options
context:
space:
mode:
authorDavid Rodríguez <[email protected]>2019-04-26 13:26:21 +0200
committerHiroshi SHIBATA <[email protected]>2019-04-28 11:07:45 +0900
commitd0a54673202458455244f79ed212a97727f0c7c7 ()
tree4d984b9e2675d906b3e336c7f951f03b11316546 /lib/rubygems/config_file.rb
parenta15f7dd1fb1148c3d586238ee6907875f2e40379 (diff)
Update rubygems with latest upstream changes
Closes: https://.com/ruby/ruby/pull/2154
-rw-r--r--lib/rubygems/config_file.rb7
1 files changed, 4 insertions, 3 deletions
@@ -197,9 +197,10 @@ class Gem::ConfigFile
platform_config = Marshal.load Marshal.dump(PLATFORM_DEFAULTS)
system_config = load_file SYSTEM_WIDE_CONFIG_FILE
user_config = load_file config_file_name.dup.untaint
- environment_config = (ENV['GEMRC'] || '').split(/[:;]/).inject({}) do |result, file|
- result.merge load_file file
- end
@hash = operating_system_config.merge platform_config
unless arg_list.index '--norc'