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

Merge pull request #6591 from amyspark/fix-depth-upgrade-check

Browse Source 
upgrade: reject formulae checked in earlier levels
This commit is contained in:
Mike McQuaid 2019-10-14 08:44:10 +01:00 committed by GitHub
commit f1702e5139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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