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

ruby-changes:68428

From: David <ko1@a...>
Date: Wed, 13 Oct 2021 21:16:51 +0900 (JST)
Subject: [ruby-changes:68428] d1e6f2226b (master): [rubygems/rubygems] No need to use converged dependencies either

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

From d1e6f2226bccebaf5dfd20d64b794d3caa08e52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Wed, 29 Sep 2021 20:53:29 +0200
Subject: [rubygems/rubygems] No need to use converged dependencies either

This is exclusively about the lockfile.

https://github.com/rubygems/rubygems/commit/d6c6d040cd
---
 lib/bundler/definition.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 96c7c862d7..e50266f5a2 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -762,7 +762,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L762
       end
 
       resolve = SpecSet.new(converged)
-      @locked_specs_incomplete_for_platform = !@locked_specs.for(expand_dependencies(requested_dependencies & deps), true, true)
+      @locked_specs_incomplete_for_platform = !@locked_specs.for(expand_dependencies(requested_dependencies & locked_dependencies), true, true)
       resolve = SpecSet.new(resolve.for(expand_dependencies(deps, true), false, false).reject{|s| @unlock[:gems].include?(s.name) })
       diff    = nil
 
-- 
cgit v1.2.1


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

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