diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rubygems.rb | 9 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Jul 20 11:35:11 2010 Evan Phoenix <evan@ruby-lang.org> + + * lib/rubygems.rb: Load the custom require if --disable-rubygems + was used. + Tue Jul 20 11:27:18 2010 Evan Phoenix <evan@ruby-lang.org> * gem_prelude.rb: Pull in rubygem's custom require diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 42e189ed4a..fcb1ebd3db 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -1124,9 +1124,12 @@ end ## # Enables the require hook for RubyGems. # -# We remove the paths prelude added, so we need custom require to get -# any gems now. -# require 'rubygems/custom_require' +# 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 Gem.clear_paths |