diff options
| author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-14 02:02:12 +0000 |
|---|---|---|
| committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-14 02:02:12 +0000 |
| commit | f52c2cc24d1070f1997921c1d870cdd55327ba2a (patch) | |
| tree | 4cc19851c0a696bda9d17671ed15b980409bdce5 /lib | |
| parent | 8409156e243f670590708742354c8af6a99def3b (diff) | |
Reduced gem_prelude to just require rubygems. Reviewed by Evan Phoenix
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems.rb | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 6c13f7bce2..9f72b8aa45 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -5,13 +5,6 @@ # See LICENSE.txt for permissions. #++ -gem_disabled = !defined? Gem - -unless gem_disabled - # Nuke the Quickloader stuff - Gem::QuickLoader.remove -end - require 'rubygems/defaults' require 'thread' require 'etc' @@ -584,9 +577,9 @@ module Gem end def self.remove_prelude_paths - Gem::QuickLoader::GemLoadPaths.each do |path| - $LOAD_PATH.delete(path) - end + # Gem::QuickLoader::GemLoadPaths.each do |path| + # $LOAD_PATH.delete(path) + # end end ## @@ -1120,15 +1113,7 @@ class << Gem end end -## -# Enables the require hook for RubyGems. -# -# if --disable-rubygems was used, then the prelude wasn't loaded, so -# we need to load the custom_require now. - -if gem_disabled - require 'rubygems/custom_require' -end +require 'rubygems/custom_require' Gem.clear_paths |