From 80b993afc3b892e19c6b6f68d7298b48c49e7889 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Dec 2008 09:52:23 +0000
Subject: merges r20923 from trunk into ruby_1_9_1. Don't remove methods twice.
  [bug#555]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 4 ++++
 gem_prelude.rb | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 31e4e37eb..ba116df3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 23 08:04:58 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* gem_prelude.rb: Don't remove methods twice.  [bug#555]
+
 Wed Dec 24 20:15:50 2008  Koichi Sasada  <ko1@atdot.net>
 
         * tool/file2lastrev.rb (get_revisions): fix to ignore end of line.
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 406f40fe5..becf626a8 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -198,7 +198,13 @@ if defined?(Gem) then
 
     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
-- 
cgit