diff options
| author | David Rodriguez <deivid.rodriguez@riseup.net> | 2023-09-25 16:26:06 +0200 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2023-09-27 03:29:37 +0000 |
| commit | 57c3e45ee8d43c401ff1e52105ecbca2bd4e7550 (patch) | |
| tree | be278ed84e64594ee087731773328aa9b727a047 /lib/bundler/gem_version_promoter.rb | |
| parent | 705bd6439de07db1502d2fc3ac6e13ae449fc12e (diff) | |
[rubygems/rubygems] Fix `bundle lock --minor --update <dep>` edge case
When the latest allowed minor of `dep` adds a new dependency, that new
dependency would be incorrectly resolved to the latest minor of the
first major version.
https://github.com/rubygems/rubygems/commit/fd50c9d4f3
Diffstat (limited to 'lib/bundler/gem_version_promoter.rb')
| -rw-r--r-- | lib/bundler/gem_version_promoter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/gem_version_promoter.rb b/lib/bundler/gem_version_promoter.rb index d281f46eeb..c7eacd1930 100644 --- a/lib/bundler/gem_version_promoter.rb +++ b/lib/bundler/gem_version_promoter.rb @@ -101,7 +101,7 @@ module Bundler next 1 if b_pre && !a_pre end - if major? + if major? || locked_version.nil? a <=> b elsif either_version_older_than_locked?(a, b, locked_version) a <=> b @@ -117,7 +117,7 @@ module Bundler end def either_version_older_than_locked?(a, b, locked_version) - locked_version && (a.version < locked_version || b.version < locked_version) + a.version < locked_version || b.version < locked_version end def segments_do_not_match?(a, b, level) |