archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 02:53:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Backport r35374 and r35375

Browse source 
* 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.

* lib/rubygems/version.rb:  Fixed init_with warning by calling into
  yaml_initialize (for syck) from psych's init_with



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2012-04-19 22:43:16 +00:00
parent b51081308b
commit de280961df
37 changed files with 1190 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/rubygems/custom_require.rb
View file

@ -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