diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:53:21 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:53:21 +0000 |
| commit | 809584595d3ba4c85b93536fcae140d696ab4238 (patch) | |
| tree | 8d47378e916d61c19bf37a280ce1424b02087c5f | |
| parent | 15d785a4a2ab7c7311b36f0a0f9854ef44cfc8e0 (diff) | |
merges r20937 from trunk into ruby_1_9_1.
Match full RubyGems behavior when a gem can't be found
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | gem_prelude.rb | 9 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Tue Dec 23 15:46:47 2008 Eric Hodel <drbrain@segment7.net> + * gem_prelude.rb: Match full RubyGems behavior when a gem can't be + found. + Tue Dec 23 15:30:02 2008 NAKAMURA Usaku <usa@ruby-lang.org> * io.c (pipe_open): need to initialize args. diff --git a/gem_prelude.rb b/gem_prelude.rb index becf626a8..553912c83 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 |