evan	2010-07-21 03:36:25 +0900 (Wed, 21 Jul 2010)

  New Revision: 28695

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28695

  Log:
    Be sure to load the custom require even if --disable-rubygems was used

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28694)
+++ ChangeLog	(revision 28695)
@@ -1,3 +1,8 @@
+Tue Jul 20 11:35:11 2010  Evan Phoenix  <evan@r...>
+
+	* lib/rubygems.rb: Load the custom require if --disable-rubygems
+	  was used.
+
 Tue Jul 20 11:27:18 2010  Evan Phoenix  <evan@r...>
 
 	* gem_prelude.rb: Pull in rubygem's custom require
Index: lib/rubygems.rb
===================================================================
--- lib/rubygems.rb	(revision 28694)
+++ lib/rubygems.rb	(revision 28695)
@@ -1124,10 +1124,13 @@
 ##
 # 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
 
 Gem.load_plugins

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/