diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2023-03-23 20:29:24 +0100 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-03-28 15:25:40 +0900 |
commit | eaddd386ecf3cf7efb0857e07dbcd66776dd4954 (patch) | |
tree | bafef496524461a039934c776f176b81677cb2de /lib/bundler | |
parent | 298cb57c115e789c021962c758eb734c2d8ee1f6 (diff) | |
download | ruby-eaddd386ecf3cf7efb0857e07dbcd66776dd4954.tar.gz |
[rubygems/rubygems] Also set min locked requirements when not unlocking
https://github.com/rubygems/rubygems/commit/3561ac23d6
Diffstat (limited to 'lib/bundler')
-rw-r--r-- | lib/bundler/definition.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |