summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 09:52:23 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 09:52:23 +0000
commite8cc8a8120715bd47da679127ceb89844400051f (patch)
tree2b5374c8e9528ca41495e173f9524e6c090926a1
parentaf627192b768216371bda06476940d7290b94a31 (diff)
merges r20923 from trunk into ruby_1_9_1.
Don't remove methods twice. [bug#555] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21006 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 31e4e37eb9..ba116df3c5 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 406f40fe5a..becf626a80 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