[前][次][番号順一覧][スレッド一覧]

ruby-changes:69823

From: David <ko1@a...>
Date: Fri, 19 Nov 2021 10:12:22 +0900 (JST)
Subject: [ruby-changes:69823] 39c4673e3c (master): [rubygems/rubygems] Previous logic can mostly go now

https://git.ruby-lang.org/ruby.git/commit/?id=39c4673e3c

From 39c4673e3cd537f61197513d3ed202f3b885a899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Wed, 17 Nov 2021 21:59:18 +0100
Subject: [rubygems/rubygems] Previous logic can mostly go now

https://github.com/rubygems/rubygems/commit/3241b34055
---
 lib/bundler/definition.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 750536089b0..d88436bdbd4 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -852,16 +852,11 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L852
 
     def additional_base_requirements_for_resolve
       return [] unless @locked_gems && unlocking? && !sources.expired_sources?(@locked_gems.sources)
-      dependencies_by_name = dependencies.inject({}) {|memo, dep| memo.update(dep.name => dep) }
-      converge_specs(@locked_gems.specs).reduce({}) do |requirements, locked_spec|
+      converge_specs(@locked_gems.specs).map do |locked_spec|
         name = locked_spec.name
-        dependency = dependencies_by_name[name]
-        next requirements if @locked_gems.dependencies[name] != dependency
-        next requirements if dependency && dependency.source.is_a?(Source::Path)
         dep = Gem::Dependency.new(name, ">= #{locked_spec.version}")
-        requirements[name] = DepProxy.get_proxy(dep, locked_spec.platform)
-        requirements
-      end.values
+        DepProxy.get_proxy(dep, locked_spec.platform)
+      end
     end
 
     def equivalent_rubygems_remotes?(source)
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]