From a3401317cb697ff670d39d759d9b630c1e8560d9 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Dec 2008 09:53:21 +0000
Subject: merges r20937 from trunk into ruby_1_9_1. Match full RubyGems
 behavior when a gem can't be found

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 gem_prelude.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'gem_prelude.rb')

diff --git a/gem_prelude.rb b/gem_prelude.rb
index becf626a80..553912c83d 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -18,6 +18,9 @@ if defined?(Gem) then
 
   module Gem
 
+    class LoadError < ::LoadError
+    end
+
     ConfigMap = {
       :sitedir => RbConfig::CONFIG["sitedir"],
       :ruby_version => RbConfig::CONFIG["ruby_version"],
@@ -183,13 +186,13 @@ if defined?(Gem) then
 
       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 @@ if defined?(Gem) then
       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
-- 
cgit v1.2.3