From 75d29db8f965893bb6ab38b9008abc80cdda246e Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 17 Aug 2019 08:52:13 +0900 Subject: Revert "[rubygems/rubygems] [Require] Ensure -I beats a default gem" This reverts commit 00cd5d74cecb6aa4a184e57e2b8246ef6e45d458. --- lib/rubygems/core_ext/kernel_require.rb | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'lib/rubygems/core_ext') diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb index 5986e356bc..8c85ef79fc 100755 --- a/lib/rubygems/core_ext/kernel_require.rb +++ b/lib/rubygems/core_ext/kernel_require.rb @@ -36,26 +36,6 @@ module Kernel path = path.to_path if path.respond_to? :to_path - resolved_path = begin - rp = nil - $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp| - Gem.suffixes.each do |s| - full_path = File.expand_path(File.join(lp, "#{path}#{s}").untaint) - if File.file?(full_path) - rp = full_path - break - end - end - break if rp - end - rp - end - - if resolved_path - RUBYGEMS_ACTIVATION_MONITOR.exit - return gem_original_require(resolved_path) - end - if spec = Gem.find_unresolved_default_spec(path) begin Kernel.send(:gem, spec.name, "#{Gem::Requirement.default}.a") -- cgit v1.2.3