From eaddd386ecf3cf7efb0857e07dbcd66776dd4954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 23 Mar 2023 20:29:24 +0100 Subject: [rubygems/rubygems] Also set min locked requirements when not unlocking https://github.com/rubygems/rubygems/commit/3561ac23d6 --- lib/bundler/definition.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 9763298504..5b0db19b87 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -886,8 +886,9 @@ module Bundler end def additional_base_requirements_for_resolve(resolution_packages, last_resolve) - return resolution_packages unless @locked_gems && unlocking? && !sources.expired_sources?(@locked_gems.sources) + return resolution_packages unless @locked_gems && !sources.expired_sources?(@locked_gems.sources) converge_specs(@originally_locked_specs - last_resolve).each do |locked_spec| + next if locked_spec.source.is_a?(Source::Path) resolution_packages.base_requirements[locked_spec.name] = Gem::Requirement.new(">= #{locked_spec.version}") end resolution_packages -- cgit v1.2.3