From 65c217933639b9f4f40d028440b09b046b0cf115 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 22 Jun 2023 13:15:07 +0900 Subject: [PATCH] [rubygems/rubygems] Molinillo::DependencyGraph is initialized in Molinillo::Resolver#resolve https://github.com/rubygems/rubygems/commit/1c39e24c95 --- lib/rubygems/resolver.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb index 8b9d41b40ffc5c..8664bb75827658 100644 --- a/lib/rubygems/resolver.rb +++ b/lib/rubygems/resolver.rb @@ -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)