yugui	2008-12-25 18:53:21 +0900 (Thu, 25 Dec 2008)

  New Revision: 21011

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

  Log:
    merges r20937 from trunk into ruby_1_9_1.
    Match full RubyGems behavior when a gem can't be found

  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 21010)
+++ ruby_1_9_1/ChangeLog	(revision 21011)
@@ -1,3 +1,7 @@
+Tue Dec 23 15:46:47 2008  Eric Hodel  <drbrain@s...>
+	* gem_prelude.rb:  Match full RubyGems behavior when a gem can't be
+	  found.
+
 Tue Dec 23 15:30:02 2008  NAKAMURA Usaku  <usa@r...>
 
 	* io.c (pipe_open): need to initialize args.
Index: ruby_1_9_1/gem_prelude.rb
===================================================================
--- ruby_1_9_1/gem_prelude.rb	(revision 21010)
+++ ruby_1_9_1/gem_prelude.rb	(revision 21011)
@@ -18,6 +18,9 @@
 
   module Gem
 
+    class LoadError < ::LoadError
+    end
+
     ConfigMap = {
       :sitedir => RbConfig::CONFIG["sitedir"],
       :ruby_version => RbConfig::CONFIG["ruby_version"],
@@ -183,13 +186,13 @@
 
       begin
         require 'rubygems/defaults/operating_system'
-      rescue LoadError
+      rescue ::LoadError
       end
 
       if defined?(RUBY_ENGINE) then
         begin
           require "rubygems/defaults/#{RUBY_ENGINE}"
-        rescue LoadError
+        rescue ::LoadError
         end
       end
     ensure
@@ -228,7 +231,7 @@
       def push_gem_version_on_load_path(gem_name, *version_requirements)
         if version_requirements.empty?
           unless GemPaths.has_key?(gem_name)
-            raise LoadError.new("Could not find RubyGem #{gem_name} (>= 0)\n")
+            raise Gem::LoadError.new("Could not find RubyGem #{gem_name} (>= 0)\n")
           end
 
           # highest version gems already active

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