From 896bbb9fadd10e1ad06ff3fd7d0608acda01ac06 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 13 Jul 2021 20:58:08 +0900 Subject: Merge RubyGems/Bundler master from 8459ebd6ad65ce3397233416dc64083ae7572bb9 --- lib/bundler/settings.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/bundler/settings.rb') diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index 95da31a765..de42cc16af 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -428,12 +428,8 @@ module Bundler def global_config_file if ENV["BUNDLE_CONFIG"] && !ENV["BUNDLE_CONFIG"].empty? Pathname.new(ENV["BUNDLE_CONFIG"]) - else - begin - Bundler.user_bundle_path("config") - rescue PermissionError, GenericSystemCallError - nil - end + elsif Bundler.rubygems.user_home && !Bundler.rubygems.user_home.empty? + Pathname.new(Bundler.rubygems.user_home).join(".bundle/config") end end -- cgit v1.2.3