diff options
Diffstat (limited to 'lib/rubygems/custom_require.rb')
| -rw-r--r-- | lib/rubygems/custom_require.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/rubygems/custom_require.rb b/lib/rubygems/custom_require.rb index 480cb7e315..88e7aa4c4c 100644 --- a/lib/rubygems/custom_require.rb +++ b/lib/rubygems/custom_require.rb @@ -1,3 +1,9 @@ +###################################################################### +# This file is imported from the rubygems project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis or Eric Hodel. +###################################################################### + #-- # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. # All rights reserved. @@ -28,10 +34,8 @@ module Kernel def require(path) # :doc: gem_original_require path rescue LoadError => load_error - if load_error.message.end_with?(path) - if Gem.try_activate(path) - return gem_original_require(path) - end + if load_error.message.end_with?(path) and Gem.try_activate(path) then + return gem_original_require(path) end raise load_error @@ -40,5 +44,5 @@ module Kernel private :require private :gem_original_require -end unless Kernel.private_method_defined?(:gem_original_require) +end |