mirror of
https://github.com/ruby/ruby.git
synced 2025-09-21 03:24:00 +02:00
Merge pull request #5482 from hsbt/rubygems-3-3-bundler-2-3
Merge RubyGems 3.3.x and Bundler 2.3.x
This commit is contained in:
parent
69463805f0
commit
6794f8cf92
115 changed files with 1701 additions and 889 deletions
|
@ -76,21 +76,21 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|||
|
||||
newest = found.last
|
||||
|
||||
unless newest
|
||||
exc = Gem::UnsatisfiableDependencyError.new request
|
||||
exc.errors = errors
|
||||
|
||||
raise exc
|
||||
end
|
||||
|
||||
unless @force
|
||||
found_matching_metadata = found.reverse.find do |spec|
|
||||
metadata_satisfied?(spec)
|
||||
end
|
||||
|
||||
if found_matching_metadata.nil?
|
||||
if newest
|
||||
ensure_required_ruby_version_met(newest.spec)
|
||||
ensure_required_rubygems_version_met(newest.spec)
|
||||
else
|
||||
exc = Gem::UnsatisfiableDependencyError.new request
|
||||
exc.errors = errors
|
||||
|
||||
raise exc
|
||||
end
|
||||
ensure_required_ruby_version_met(newest.spec)
|
||||
ensure_required_rubygems_version_met(newest.spec)
|
||||
else
|
||||
newest = found_matching_metadata
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue