[前][次][番号順一覧][スレッド一覧]

ruby-changes:56029

From: Kazuhiro <ko1@a...>
Date: Thu, 6 Jun 2019 15:42:45 +0900 (JST)
Subject: [ruby-changes:56029] Kazuhiro NISHIYAMA: c2a9c35024 (trunk): Stop `circular require` warning

https://git.ruby-lang.org/ruby.git/commit/?id=c2a9c35024

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


diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 3508a1f..33502f6 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -1207,7 +1207,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]} https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L1207
     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 v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]