1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Extract Definition#no_resolved_needed?

Browse Source 
https://github.com/rubygems/rubygems/commit/1ff8626571
This commit is contained in:
David Rodríguez 2023-06-09 21:10:12 +02:00 committed by Hiroshi SHIBATA
parent 4f1b1817a8
commit 21238f38a8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/bundler/definition.rb
View File

@ -281,7 +281,7 @@ module Bundler
@resolve ||= if Bundler.frozen_bundle? @resolve ||= if Bundler.frozen_bundle?
Bundler.ui.debug "Frozen, using resolution from the lockfile" Bundler.ui.debug "Frozen, using resolution from the lockfile"
@locked_specs @locked_specs
elsif !unlocking? && nothing_changed? elsif no_resolve_needed?
if deleted_deps.any? if deleted_deps.any?
Bundler.ui.debug "Some dependencies were deleted, using a subset of the resolution from the lockfile" Bundler.ui.debug "Some dependencies were deleted, using a subset of the resolution from the lockfile"
SpecSet.new(filter_specs(@locked_specs, @dependencies - deleted_deps)) SpecSet.new(filter_specs(@locked_specs, @dependencies - deleted_deps))
@ -477,6 +477,10 @@ module Bundler
!@source_changes && !@dependency_changes && !@new_platform && !@path_changes && !@local_changes && !@incomplete_lockfile !@source_changes && !@dependency_changes && !@new_platform && !@path_changes && !@local_changes && !@incomplete_lockfile
end end
def no_resolve_needed?
!unlocking? && nothing_changed?
end
def unlocking? def unlocking?
@unlocking @unlocking
end end

2
lib/bundler/runtime.rb
View File

@ -94,7 +94,7 @@ module Bundler
definition_method :requires definition_method :requires
def lock(opts = {}) def lock(opts = {})
return if @definition.nothing_changed? && !@definition.unlocking? return if @definition.no_resolve_needed?
@definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections]) @definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections])
end end