Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid infinite loops when hitting resolution bugs #6722

Merged
merged 1 commit into from
Jun 6, 2023
Merged

Avoid infinite loops when hitting resolution bugs #6722

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def choose_package_version
def resolve_conflict(incompatibility)
logger.info { "conflict: #{incompatibility}" }

new_incompatibility = false
new_incompatibility = nil

while !incompatibility.failure?
most_recent_term = nil
Expand Down Expand Up @@ -204,7 +204,7 @@ def resolve_conflict(incompatibility)
solution.backtrack(previous_level)

if new_incompatibility
add_incompatibility(incompatibility)
add_incompatibility(new_incompatibility)
end

return incompatibility
Expand All @@ -219,9 +219,14 @@ def resolve_conflict(incompatibility)
new_terms << difference.invert
end

incompatibility = Incompatibility.new(new_terms, cause: Incompatibility::ConflictCause.new(incompatibility, most_recent_satisfier.cause))
new_incompatibility = Incompatibility.new(new_terms, cause: Incompatibility::ConflictCause.new(incompatibility, most_recent_satisfier.cause))

new_incompatibility = true
if incompatibility.to_s == new_incompatibility.to_s
logger.info { "!! failed to resolve conflicts, this shouldn't have happened" }
break
end

incompatibility = new_incompatibility

partially = difference ? " partially" : ""
logger.info { "! #{most_recent_term} is#{partially} satisfied by #{most_recent_satisfier.term}" }
Expand Down