diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | lib/rubygems/core_ext/kernel_require.rb | 28 |
2 files changed, 31 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Sat Feb 22 12:55:24 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + (merged partially from r42927) + * lib/rubygems/core_ext/kernel_require.rb: Backport a fix for concurrent + requires. [ruby-core:58918] [Backport #9224] + see also https://github.com/rubygems/rubygems/pull/833 + Sat Feb 22 11:50:52 2014 Eric Wong <e@80x24.org> * ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb index 4cd120b120..a591d386a9 100755 --- a/lib/rubygems/core_ext/kernel_require.rb +++ b/lib/rubygems/core_ext/kernel_require.rb @@ -50,7 +50,12 @@ module Kernel # normal require handle loading a gem from the rescue below. if Gem::Specification.unresolved_deps.empty? then - return gem_original_require(path) + begin + RUBYGEMS_ACTIVATION_MONITOR.exit + return gem_original_require(path) + ensure + RUBYGEMS_ACTIVATION_MONITOR.enter + end end # If +path+ is for a gem that has already been loaded, don't @@ -63,7 +68,12 @@ module Kernel s.activated? and s.contains_requirable_file? path } - return gem_original_require(path) if spec + begin + RUBYGEMS_ACTIVATION_MONITOR.exit + return gem_original_require(path) + ensure + RUBYGEMS_ACTIVATION_MONITOR.enter + end if spec # Attempt to find +path+ in any unresolved gems... @@ -111,11 +121,21 @@ module Kernel valid.activate end - gem_original_require path + begin + RUBYGEMS_ACTIVATION_MONITOR.exit + return gem_original_require(path) + ensure + RUBYGEMS_ACTIVATION_MONITOR.enter + end rescue LoadError => load_error 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) + begin + RUBYGEMS_ACTIVATION_MONITOR.exit + return gem_original_require(path) + ensure + RUBYGEMS_ACTIVATION_MONITOR.enter + end end raise load_error |