yugui	2008-12-25 18:52:23 +0900 (Thu, 25 Dec 2008)

  New Revision: 21006

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

  Log:
    merges r20923 from trunk into ruby_1_9_1.
    Don't remove methods twice.  [bug#555]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/gem_prelude.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21005)
+++ ruby_1_9_1/ChangeLog	(revision 21006)
@@ -1,3 +1,7 @@
+Tue Dec 23 08:04:58 2008  Eric Hodel  <drbrain@s...>
+
+	* gem_prelude.rb: Don't remove methods twice.  [bug#555]
+
 Wed Dec 24 20:15:50 2008  Koichi Sasada  <ko1@a...>
 
         * tool/file2lastrev.rb (get_revisions): fix to ignore end of line.
Index: ruby_1_9_1/gem_prelude.rb
===================================================================
--- ruby_1_9_1/gem_prelude.rb	(revision 21005)
+++ ruby_1_9_1/gem_prelude.rb	(revision 21006)
@@ -198,7 +198,13 @@
 
     module QuickLoader
 
+      @loaded_full_rubygems_library = false
+
       def self.load_full_rubygems_library
+        return if @loaded_full_rubygems_library
+
+        @loaded_full_rubygems_library = true
+
         class << Gem
           Gem::GEM_PRELUDE_METHODS.each do |method_name|
             undef_method method_name

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