diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-06-22 13:15:07 +0900 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2023-06-27 02:15:40 +0000 |
| commit | 65c217933639b9f4f40d028440b09b046b0cf115 (patch) | |
| tree | 0be1d80a91dd5d7ba8e3ff86eea45adb8d739533 | |
| parent | ec59b95cfd8f9ff59353f20ab9edbf4786e858fb (diff) | |
[rubygems/rubygems] Molinillo::DependencyGraph is initialized in Molinillo::Resolver#resolve
https://github.com/rubygems/rubygems/commit/1c39e24c95
| -rw-r--r-- | lib/rubygems/resolver.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb index 8b9d41b40f..8664bb7582 100644 --- a/lib/rubygems/resolver.rb +++ b/lib/rubygems/resolver.rb @@ -187,8 +187,7 @@ class Gem::Resolver # 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) |