diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-03-27 18:31:51 +0100 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-05-08 14:13:29 +0900 |
| commit | 1039c32de6ac27400b2cc9eca2b0cd382ddcfbdd (patch) | |
| tree | 5fe362aa72a7cd34321d35d96931a6c27566d54c /lib/rubygems | |
| parent | 43daf4d288926c90af716ff0d8306501fd1b3a13 (diff) | |
[rubygems/rubygems] Simplify nested require exceptions
https://github.com/rubygems/rubygems/commit/7fbef2f0e3
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3092
Diffstat (limited to 'lib/rubygems')
| -rw-r--r-- | lib/rubygems/core_ext/kernel_require.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb index a8d170f13a..ed24111bd5 100644 --- a/lib/rubygems/core_ext/kernel_require.rb +++ b/lib/rubygems/core_ext/kernel_require.rb @@ -156,8 +156,7 @@ module Kernel RUBYGEMS_ACTIVATION_MONITOR.enter begin - if load_error.message.start_with?("Could not find") or - (load_error.message.end_with?(path) and Gem.try_activate(path)) + if load_error.message.end_with?(path) and Gem.try_activate(path) require_again = true end ensure |