From 9d0d4d8a172a6ea61d184c473d645e1faadea804 Mon Sep 17 00:00:00 2001 From: evan Date: Tue, 20 Jul 2010 18:36:25 +0000 Subject: Be sure to load the custom require even if --disable-rubygems was used git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/rubygems.rb | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 867f4d07c3..c529a1ac1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 20 11:35:11 2010 Evan Phoenix + + * lib/rubygems.rb: Load the custom require if --disable-rubygems + was used. + Tue Jul 20 11:27:18 2010 Evan Phoenix * 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 -- cgit v1.2.3