diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2022-08-24 10:17:04 +0200 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2022-09-12 22:13:30 +0900 |
commit | dce73c8616eb2e91cb0330c9b32f3edf8e771a67 (patch) | |
tree | f19fba9a6ab407d3616ff1e49c75ef17ac3eecf2 | |
parent | 6a21d196ba774f219956ede5d4cf276b1af433c4 (diff) |
[rubygems/rubygems] Simplify instantiating the gem version promoter
https://github.com/rubygems/rubygems/commit/c4e2737f2c
-rw-r--r-- | lib/bundler/definition.rb | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 79369ec374..a46d7387de 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -106,6 +106,7 @@ module Bundler @locked_gems = nil @locked_deps = {} @locked_specs = SpecSet.new([]) + @originally_locked_specs = @locked_specs @locked_sources = [] @locked_platforms = [] end @@ -149,18 +150,7 @@ module Bundler end def gem_version_promoter - @gem_version_promoter ||= begin - locked_specs = - if unlocking? && @locked_specs.empty? && !@lockfile_contents.empty? - # Definition uses an empty set of locked_specs to indicate all gems - # are unlocked, but GemVersionPromoter needs the locked_specs - # for conservative comparison. - Bundler::SpecSet.new(@locked_gems.specs) - else - @locked_specs - end - GemVersionPromoter.new(locked_specs, @unlock[:gems]) - end + @gem_version_promoter ||= GemVersionPromoter.new(@originally_locked_specs, @unlock[:gems]) end def resolve_only_locally! |