Skip to content

Commit

Permalink
[rubygems/rubygems] Molinillo::DependencyGraph is initialized in Moli…
Browse files Browse the repository at this point in the history
…nillo::Resolver#resolve

rubygems/rubygems@1c39e24c95
  • Loading branch information
hsbt authored and matzbot committed Jun 27, 2023
1 parent ec59b95 commit 65c2179
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions lib/rubygems/resolver.rb
Expand Up @@ -187,8 +187,7 @@ def debug?
# Proceed with resolution! Returns an array of ActivationRequest objects.

def resolve
locking_dg = Molinillo::DependencyGraph.new
Molinillo::Resolver.new(self, self).resolve(@needed.map {|d| DependencyRequest.new d, nil }, locking_dg).tsort.map(&:payload).compact
Molinillo::Resolver.new(self, self).resolve(@needed.map {|d| DependencyRequest.new d, nil }).tsort.map(&:payload).compact
rescue Molinillo::VersionConflict => e
conflict = e.conflicts.values.first
raise Gem::DependencyResolutionError, Conflict.new(conflict.requirement_trees.first.first, conflict.existing, conflict.requirement)
Expand Down

0 comments on commit 65c2179

Please sign in to comment.