summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-22 23:06:47 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-22 23:06:47 +0000
commitd74478c987a13c3a175b2ab58334f78f2db42352 (patch)
treebef3d56f6a13cf8de9493166b6354c7aef11eabe
parent7177974da68976ed945699e5da5ac6640bd1e0a7 (diff)
downloadruby-d74478c987a13c3a175b2ab58334f78f2db42352.tar.gz
ruby-d74478c987a13c3a175b2ab58334f78f2db42352.tar.xz
ruby-d74478c987a13c3a175b2ab58334f78f2db42352.zip
Don't remove methods twice. [bug#555]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gem_prelude.rb6
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c765976b8..f75cf921f 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]
+
Tue Dec 23 00:16:48 2008 Yusuke Endoh <mame@tsg.ne.jp>
* sprintf.c (rb_str_format): fix buffer overflow.
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