summaryrefslogtreecommitdiff
path: root/lib/bundler
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2022-04-06 09:22:49 +0200
committergit <svn-admin@ruby-lang.org>2022-05-11 16:55:49 +0900
commit8f1a8e68bae29bed1052d6b518e1fb4a01e53cbd (patch)
tree0b8baf2e99313bf56f33b1709f9d4aed6b41c808 /lib/bundler
parentc582d9862a8f9929a2b1e3392bc6c178629f4852 (diff)
[rubygems/rubygems] Fix error message on metadata mismatches
Previously we were removing not installable specs. However, if those are the only ones, that would result in a bad error message. If we still choose them as a last resort, Bundler will later check metadata right before installing a give a proper error. This is a regression of https://github.com/rubygems/rubygems/commit/565549260be5 and the fix is to revert that commit. https://github.com/rubygems/rubygems/commit/bc18912257
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/lazy_specification.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb
index fd7c8defdc..198906b987 100644
--- a/lib/bundler/lazy_specification.rb
+++ b/lib/bundler/lazy_specification.rb
@@ -94,7 +94,7 @@ module Bundler
(spec.required_ruby_version.satisfied_by?(Gem.ruby_version) &&
spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version))
end
- search = installable_candidates.last
+ search = installable_candidates.last || same_platform_candidates.last
search.dependencies = dependencies if search && (search.is_a?(RemoteSpecification) || search.is_a?(EndpointSpecification))
search
end