diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-06-28 19:25:33 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-07-07 10:03:15 +0900 |
| commit | 865221f0ba69f07f700e06b2d2f0a859a01dd233 (patch) | |
| tree | 2bd6c79b1ada4af36c62a872e7e38d2f7129e7c1 /lib/bundler/resolver.rb | |
| parent | a50de0adfff8166ea18570edafafb0ba501ff2fa (diff) | |
Merge RubyGems-3.2.21 and Bundler-2.2.21
Diffstat (limited to 'lib/bundler/resolver.rb')
| -rw-r--r-- | lib/bundler/resolver.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 9a25e49d4b..fac5070619 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -30,8 +30,10 @@ module Bundler @resolver = Molinillo::Resolver.new(self, self) @search_for = {} @base_dg = Molinillo::DependencyGraph.new + aggregate_global_source = @source_requirements[:default].is_a?(Source::RubygemsAggregate) @base.each do |ls| dep = Dependency.new(ls.name, ls.version) + ls.source = source_for(ls.name) unless aggregate_global_source @base_dg.add_vertex(ls.name, DepProxy.get_proxy(dep, ls.platform), true) end additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, d) } |