Import RubyGems r1601. [ruby-core:15381].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 1 deletions

diff --git a/gem_prelude.rb b/gem_prelude.rb
index 63f979ccab..1b4ef4409e 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -166,7 +166,13 @@ module Gem
           require_paths << File.join(path, "lib") if File.exist?(File.join(path, "lib"))
         end
       end
-
+      
+      # "tag" the first require_path inserted into the $LOAD_PATH to enable
+      # indexing correctly with rubygems proper when it inserts an explicitly
+      # gem version
+      unless require_paths.empty?
+        require_paths.first.instance_variable_set(:@gem_prelude_index, true)
+      end
       # gem directories must come after -I and ENV['RUBYLIB']
       $:[$:.index(ConfigMap[:sitelibdir]),0] = require_paths
     end