ruby-changes:74090
From: David <ko1@a...>
Date: Tue, 18 Oct 2022 16:33:47 +0900 (JST)
Subject: [ruby-changes:74090] 71dede387e (master): [rubygems/rubygems] Remove one more `expand_dependencies` call
https://git.ruby-lang.org/ruby.git/commit/?id=71dede387e From 71dede387e089023292e66c7f39305e13400c8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Tue, 23 Aug 2022 08:36:30 +0200 Subject: [rubygems/rubygems] Remove one more `expand_dependencies` call https://github.com/rubygems/rubygems/commit/996fd81871 --- lib/bundler/definition.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 1cf0bbbdb4..340b1b68dd 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -473,7 +473,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L473 def resolver @resolver ||= begin last_resolve = converge_locked_specs - remove_ruby_from_platforms_if_necessary!(dependencies) + remove_ruby_from_platforms_if_necessary!(current_dependencies) Resolver.new(source_requirements, last_resolve, gem_version_promoter, additional_base_requirements_for_resolve(last_resolve), platforms) end end @@ -877,7 +877,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L877 Bundler.local_platform == Gem::Platform::RUBY || !platforms.include?(Gem::Platform::RUBY) || (@new_platform && platforms.last == Gem::Platform::RUBY) || - !@originally_locked_specs.incomplete_ruby_specs?(expand_dependencies(dependencies)) + !@originally_locked_specs.incomplete_ruby_specs?(dependencies) remove_platform(Gem::Platform::RUBY) add_current_platform -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/