archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-24 05:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Reapply "[rubygems/rubygems] Fix activation conflicts when circularly requiring a gem"

Browse source 
This reverts commit 04cf66765a.
This commit is contained in:
Hiroshi SHIBATA 2024-01-19 13:32:53 +09:00
parent d51f4c9288
commit 00dc1cace8
3 changed files with 52 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/rubygems/core_ext/kernel_require.rb
View file

@ -42,7 +42,11 @@ module Kernel
# If +path+ belongs to a default gem, we activate it and then go straight
# to normal require
if spec = Gem.find_unresolved_default_spec(path)
if spec = Gem.find_default_spec(path)
name = spec.name
next if Gem.loaded_specs[name]
# Ensure -I beats a default gem
resolved_path = begin
rp = nil
@ -60,7 +64,7 @@ module Kernel
rp
end
Kernel.send(:gem, spec.name, Gem::Requirement.default_prerelease) unless
Kernel.send(:gem, name, Gem::Requirement.default_prerelease) unless
resolved_path
next