Skip to content

Commit

Permalink
Molinillo::DependencyGraph is initialized in Molinillo::Resolver#resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
hsbt committed Jun 22, 2023
1 parent a58e808 commit 1c39e24
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions lib/rubygems/resolver.rb
Original file line number Diff line number Diff line change
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 1c39e24

Please sign in to comment.