Skip to content

Commit 68258fd

Browse files
Fix stuff
1 parent f800313 commit 68258fd

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

bundler/lib/bundler/definition.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, opti
106106
@locked_gems = nil
107107
@locked_deps = {}
108108
@locked_specs = SpecSet.new([])
109+
@originally_locked_specs = @locked_specs
109110
@locked_sources = []
110111
@locked_platforms = []
111112
end
@@ -149,7 +150,7 @@ def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, opti
149150
end
150151

151152
def gem_version_promoter
152-
@gem_version_promoter ||= GemVersionPromoter.new(@originally_locked_specs || SpecSet.new([]), @unlock[:gems])
153+
@gem_version_promoter ||= GemVersionPromoter.new(@originally_locked_specs, @unlock[:gems])
153154
end
154155

155156
def resolve_only_locally!

bundler/lib/bundler/gem_version_promoter.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ def filter_dep_specs(spec_groups, locked_spec)
123123
end
124124

125125
def sort_dep_specs(spec_groups, locked_spec)
126-
@locked_version = locked_spec.version if locked_spec
127-
@gem_name = locked_spec.name if locked_spec
126+
@locked_version = locked_spec&.version
127+
@gem_name = locked_spec&.name
128128

129129
result = spec_groups.sort do |a, b|
130130
@a_ver = a.version

0 commit comments

Comments
 (0)