summaryrefslogtreecommitdiff
path: root/lib/rubygems/resolver.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rubygems/resolver.rb')
-rw-r--r--lib/rubygems/resolver.rb7
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)