From e1c8dceb565d02129b44b571ee46cb5814ed066f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 12 Oct 2023 12:57:20 +0200 Subject: [PATCH] If we're not sure it was a resolvability error, raise original error --- .../cargo/update_checker/version_resolver.rb | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/cargo/lib/dependabot/cargo/update_checker/version_resolver.rb b/cargo/lib/dependabot/cargo/update_checker/version_resolver.rb index a2c62be3e43..17348c6568e 100644 --- a/cargo/lib/dependabot/cargo/update_checker/version_resolver.rb +++ b/cargo/lib/dependabot/cargo/update_checker/version_resolver.rb @@ -295,7 +295,11 @@ def resolvability_error?(message) return true if message.match?(/feature `[^\`]+` is required/) return true if message.include?("unexpected end of input while parsing major version number") - !original_requirements_resolvable? + original_requirements_resolvable = original_requirements_resolvable? + + return false if original_requirements_resolvable == :unknown + + !original_requirements_resolvable end def original_requirements_resolvable? @@ -310,13 +314,15 @@ def original_requirements_resolvable? true rescue SharedHelpers::HelperSubprocessFailed => e - raise unless e.message.include?("no matching version") || - e.message.include?("failed to select a version") || - e.message.include?("no matching package named") || - e.message.include?("failed to parse manifest") || - e.message.include?("failed to update submodule") - - false + if e.message.include?("no matching version") || + e.message.include?("failed to select a version") || + e.message.include?("no matching package named") || + e.message.include?("failed to parse manifest") || + e.message.include?("failed to update submodule") + false + else + :unknown + end end def workspace_native_library_update_error?(message)