diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-17 20:50:00 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-17 20:50:00 +0000 |
| commit | 22d9456b7917fe96fa81fd1d994073312753af8b (patch) | |
| tree | be157928ed84f75988ceb82a070797c3482b66a6 /lib/rubygems/custom_require.rb | |
| parent | 22263729af357eb86e8bc2165a9eaa6f25eec8a6 (diff) | |
| download | ruby-22d9456b7917fe96fa81fd1d994073312753af8b.tar.gz | |
* lib/rubygems: Update to RubyGems 1.8.22 plus r33517 and r35337 which
were ported to the rubygems git repository.
See https://github.com/rubygems/rubygems/blob/1.8/History.txt for
changes since 1.8.11.
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/custom_require.rb')
| -rw-r--r-- | lib/rubygems/custom_require.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/rubygems/custom_require.rb b/lib/rubygems/custom_require.rb index 641db842ac..c813e3aaa2 100644 --- a/lib/rubygems/custom_require.rb +++ b/lib/rubygems/custom_require.rb @@ -32,7 +32,7 @@ module Kernel # that file has already been loaded is preserved. def require path - if Gem.unresolved_deps.empty? or Gem.loaded_path? path then + if Gem.unresolved_deps.empty? then gem_original_require path else spec = Gem::Specification.find { |s| @@ -55,7 +55,8 @@ module Kernel return gem_original_require path end rescue LoadError => load_error - if load_error.message.end_with?(path) and Gem.try_activate(path) then + if load_error.message.start_with?("Could not find") or + (load_error.message.end_with?(path) and Gem.try_activate(path)) then return gem_original_require(path) end |