diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-23 08:45:19 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-23 10:17:41 +0900 |
| commit | 339227363ce0cf967fa17efa4489d823932ddabd (patch) | |
| tree | 576482ce00d03439f2dbf4714a6f309293884c2f /lib/rubygems/resolver.rb | |
| parent | 733ed1e18498f97250b788f169c37b170e0cf2b6 (diff) | |
Merge RubyGems 3.2.3 and Bundler 2.2.3
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3982
Diffstat (limited to 'lib/rubygems/resolver.rb')
| -rw-r--r-- | lib/rubygems/resolver.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb index e1c0d2dd0a..71c35ea3d3 100644 --- a/lib/rubygems/resolver.rb +++ b/lib/rubygems/resolver.rb @@ -261,7 +261,12 @@ class Gem::Resolver end def requirement_satisfied_by?(requirement, activated, spec) - requirement.matches_spec? spec + matches_spec = requirement.matches_spec? spec + return matches_spec if @soft_missing + + matches_spec && + spec.spec.required_ruby_version.satisfied_by?(Gem.ruby_version) && + spec.spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version) end def name_for(dependency) |