From c2a9c350249588677cf68b506539093504927eac Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Date: Thu, 6 Jun 2019 15:38:00 +0900
Subject: Stop `circular require` warning

---
 lib/rubygems.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/rubygems.rb')

diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 3508a1f3aa..33502f6946 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -1207,7 +1207,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     ENV["BUNDLE_GEMFILE"] ||= File.expand_path(path)
     require 'rubygems/user_interaction'
     Gem::DefaultUserInteraction.use_ui(ui) do
-      require "bundler"
+      require "bundler" unless caller_locations.any? { |location| location.path.end_with?("bundler.rb") }
       begin
         @gemdeps = Bundler.setup
       ensure
-- 
cgit v1.2.3