From 0e60bc118b66d626d7e1f985dbd15cfba5e62715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 8 Dec 2021 18:36:13 +0100 Subject: [rubygems/rubygems] Ignore dependencies not actually locked from frozen check Only needed if there can be no explicit global source (bundler < 3). https://github.com/rubygems/rubygems/commit/73923f4af5 --- lib/bundler/definition.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/bundler') diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index c2a8e2ba42..84f0367ac7 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -379,7 +379,12 @@ module Bundler both_sources = Hash.new {|h, k| h[k] = [] } @dependencies.each {|d| both_sources[d.name][0] = d } - locked_dependencies.each {|d| both_sources[d.name][1] = d } + + locked_dependencies.each do |d| + next if !Bundler.feature_flag.bundler_3_mode? && @locked_specs[d.name].empty? + + both_sources[d.name][1] = d + end both_sources.each do |name, (dep, lock_dep)| next if dep.nil? || lock_dep.nil? -- cgit v1.2.3