summaryrefslogtreecommitdiff
path: root/lib/rubygems.rb
diff options
context:
space:
mode:
authorKazuhiro NISHIYAMA <zn@mbf.nifty.com>2019-06-06 15:38:00 +0900
committerKazuhiro NISHIYAMA <zn@mbf.nifty.com>2019-06-06 15:41:55 +0900
commitc2a9c350249588677cf68b506539093504927eac (patch)
treeac888caeaf27e8c05f903e13b6d0fb4049417e67 /lib/rubygems.rb
parent861b50d81d9ed5f57b78c87b2e2f24f718db31dd (diff)
Stop `circular require` warning
Diffstat (limited to 'lib/rubygems.rb')
-rw-r--r--lib/rubygems.rb2
1 files changed, 1 insertions, 1 deletions
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