Skip to content

Commit

Permalink
If we're not sure it was a resolvability error, raise original error
Browse files Browse the repository at this point in the history
  • Loading branch information
deivid-rodriguez committed Oct 12, 2023
1 parent 9bcb67b commit e1c8dce
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions cargo/lib/dependabot/cargo/update_checker/version_resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand All @@ -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)
Expand Down

0 comments on commit e1c8dce

Please sign in to comment.