diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-16 15:35:06 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-16 15:35:06 +0000 |
| commit | cbf98166355bd8db68ec271634fe74a05662cc7f (patch) | |
| tree | 903ad81f18de0074f2f879fd7884d9d547ecf380 /lib/rubygems/core_ext/kernel_require.rb | |
| parent | 5ac6776b0f3df3ffc22d6332f616353f65ddfae2 (diff) | |
* lib/rubygems: update to RubyGems 2.0.6. the patch by drbrain.
[ruby-core:56633] [Backport #8787]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/core_ext/kernel_require.rb')
| -rwxr-xr-x | lib/rubygems/core_ext/kernel_require.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb index 71062410cb..f4f7fc8393 100755 --- a/lib/rubygems/core_ext/kernel_require.rb +++ b/lib/rubygems/core_ext/kernel_require.rb @@ -8,6 +8,8 @@ require 'monitor' module Kernel + RUBYGEMS_ACTIVATION_MONITOR = Monitor.new # :nodoc: + if defined?(gem_original_require) then # Ruby ships with a custom_require, override its require remove_method :require @@ -33,10 +35,8 @@ module Kernel # The normal <tt>require</tt> functionality of returning false if # that file has already been loaded is preserved. - ACTIVATION_MONITOR = Monitor.new - def require path - ACTIVATION_MONITOR.enter + RUBYGEMS_ACTIVATION_MONITOR.enter spec = Gem.find_unresolved_default_spec(path) if spec @@ -118,7 +118,7 @@ module Kernel raise load_error ensure - ACTIVATION_MONITOR.exit + RUBYGEMS_ACTIVATION_MONITOR.exit end private :require |