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

Fix infinite recursion in upgradable_dependents and broken_dependents

Browse Source
This commit is contained in:
Frizlab 2019-02-15 23:51:55 +01:00
parent 2ca56f6731
commit b4f76db37c
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,7 +207,7 @@ module Homebrew
end
end
def upgradable_dependents(kegs, formulae)
def upgradable_dependents(kegs, formulae, formulae_visited)
formulae_to_upgrade = Set.new
formulae_pinned = Set.new
@ -226,6 +226,9 @@ module Homebrew
dependent_formulae.each do |f|
next if formulae_to_upgrade.include?(f)
next if formulae_pinned.include?(f)
next if formulae_visited.include?(f)
formulae_visited << f
if f.outdated?(fetch_head: args.fetch_HEAD?)
if f.pinned?
@ -238,16 +241,17 @@ module Homebrew
descendants << f
end
upgradable_descendants, pinned_descendants = upgradable_dependents(kegs, descendants)
upgradable_descendants, pinned_descendants, formulae_visited =
upgradable_dependents(kegs, descendants, formulae_visited)
formulae_to_upgrade.merge upgradable_descendants
formulae_pinned.merge pinned_descendants
end
[formulae_to_upgrade, formulae_pinned]
[formulae_to_upgrade, formulae_pinned, formulae_visited]
end
def broken_dependents(kegs, formulae)
def broken_dependents(kegs, formulae, formulae_visited)
formulae_to_reinstall = Set.new
formulae_pinned_and_outdated = Set.new
@ -267,6 +271,9 @@ module Homebrew
next if formulae_to_reinstall.include?(f)
next if formulae_pinned_and_outdated.include?(f)
next if formulae_visited.include?(f)
formulae_visited << f
checker = LinkageChecker.new(keg, cache_db: db)
@ -282,14 +289,15 @@ module Homebrew
descendants << f
end
descendants_to_reinstall, descendants_pinned = broken_dependents(kegs, descendants)
descendants_to_reinstall, descendants_pinned, formulae_visited =
broken_dependents(kegs, descendants, formulae_visited)
formulae_to_reinstall.merge descendants_to_reinstall
formulae_pinned_and_outdated.merge descendants_pinned
end
end
[formulae_to_reinstall, formulae_pinned_and_outdated]
[formulae_to_reinstall, formulae_pinned_and_outdated, formulae_visited]
end
# @private
@ -320,7 +328,7 @@ module Homebrew
return if kegs.empty?
oh1 "Checking dependents for outdated formulae" if args.verbose?
upgradable, pinned = upgradable_dependents(kegs, formulae).map(&:to_a)
upgradable, pinned = upgradable_dependents(kegs, formulae, Set.new).map(&:to_a)
upgradable.sort! { |a, b| depends_on(a, b) }
@ -353,7 +361,7 @@ module Homebrew
kegs = formulae_with_runtime_dependencies
oh1 "Checking dependents for broken library links" if args.verbose?
reinstallable, pinned = broken_dependents(kegs, formulae).map(&:to_a)
reinstallable, pinned = broken_dependents(kegs, formulae, Set.new).map(&:to_a)
reinstallable.sort! { |a, b| depends_on(a, b) }