admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

upgrade: reject formulae checked in earlier levels

Browse Source
This commit is contained in:
L. E. Segovia 2019-10-12 15:53:21 +00:00
parent 70f232ada5
commit f4707a8041
No known key found for this signature in database
GPG Key ID: 2EA9E1FDA820A9F1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/upgrade.rb
View File

@ -255,7 +255,7 @@ module Homebrew
[formulae_to_upgrade, formulae_pinned] [formulae_to_upgrade, formulae_pinned]
end end
def broken_dependents(kegs, formulae) def broken_dependents(kegs, formulae, scanned = [])
formulae_to_reinstall = Set.new formulae_to_reinstall = Set.new
formulae_pinned_and_outdated = Set.new formulae_pinned_and_outdated = Set.new
@ -266,6 +266,8 @@ module Homebrew
dependents = kegs.select do |keg| dependents = kegs.select do |keg|
keg.runtime_dependencies keg.runtime_dependencies
.any? { |d| d["full_name"] == formula.full_name } .any? { |d| d["full_name"] == formula.full_name }
end.reject do |keg|
scanned.include?(keg)
end end
next if dependents.empty? next if dependents.empty?
@ -290,7 +292,9 @@ module Homebrew
descendants << f descendants << f
end end
descendants_to_reinstall, descendants_pinned = broken_dependents(kegs, descendants) scanned << dependents
descendants_to_reinstall, descendants_pinned = broken_dependents(kegs, descendants, scanned)
formulae_to_reinstall.merge descendants_to_reinstall formulae_to_reinstall.merge descendants_to_reinstall
formulae_pinned_and_outdated.merge descendants_pinned formulae_pinned_and_outdated.merge descendants_pinned