summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2022-08-23 08:36:30 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2022-10-18 16:33:15 +0900
commit71dede387e089023292e66c7f39305e13400c8c0 (patch)
treea11608f331a539c8e11c5bc14182ba7ac1e21f37
parentcef7f6b2241565f51bb724c19b89b8320825b98a (diff)
[rubygems/rubygems] Remove one more `expand_dependencies` call
https://github.com/rubygems/rubygems/commit/996fd81871
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/6578
-rw-r--r--lib/bundler/definition.rb4
1 files 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
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
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