From b7ad9eda3c5b4c102077ebb9619b99b6141aab86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 4 Oct 2023 23:18:59 +0200 Subject: [rubygems/rubygems] Tweak platform mismatch resolution errors https://github.com/rubygems/rubygems/commit/20460bc1ee --- lib/bundler/resolver.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'lib/bundler/resolver.rb') diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 3d9b0c5674..82e08291a7 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -295,15 +295,21 @@ module Bundler end specs_matching_requirement = filter_matching_specs(specs, package.dependency.requirement) - if specs_matching_requirement.any? + not_found_message = if specs_matching_requirement.any? specs = specs_matching_requirement matching_part = requirement_label platforms = package.platforms - platform_label = platforms.size == 1 ? "platform '#{platforms.first}" : "platforms '#{platforms.join("', '")}" - requirement_label = "#{requirement_label}' with #{platform_label}" + + if platforms.size == 1 + "Could not find gem '#{requirement_label}' with platform '#{platforms.first}'" + else + "Could not find gems matching '#{requirement_label}' valid for all resolution platforms (#{platforms.join(", ")})" + end + else + "Could not find gem '#{requirement_label}'" end - message = String.new("Could not find gem '#{requirement_label}' in #{source}#{cache_message}.\n") + message = String.new("#{not_found_message} in #{source}#{cache_message}.\n") if specs.any? message << "\n#{other_specs_matching_message(specs, matching_part)}" -- cgit v1.2.3