ruby-changes:56030
From: Kazuhiro <ko1@a...>
Date: Thu, 6 Jun 2019 16:50:48 +0900 (JST)
Subject: [ruby-changes:56030] Kazuhiro NISHIYAMA: fcc36d767b (trunk): Revert "Stop `circular require` warning"
https://git.ruby-lang.org/ruby.git/commit/?id=fcc36d767b From fcc36d767b60329692b27d685ba867848da6aa04 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA <zn@m...> Date: Thu, 6 Jun 2019 16:49:40 +0900 Subject: Revert "Stop `circular require` warning" This reverts commit c2a9c350249588677cf68b506539093504927eac. It cannot stop `circular require` warning. diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 33502f6..3508a1f 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" unless caller_locations.any? { |location| location.path.end_with?("bundler.rb") } + require "bundler" begin @gemdeps = Bundler.setup ensure -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/