From e5eaf57856218b0a14c3d35d6a9b06737d2724c8 Mon Sep 17 00:00:00 2001 From: AndrewMcBurney Date: Mon, 9 Apr 2018 14:19:07 -0400 Subject: [PATCH] Fixed broken test due to changing usage of `DatabaseCache` to block usage. --- .../extend/os/mac/formula_cellar_checks.rb | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb b/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb index f7e3a16935..bf2a086d3b 100644 --- a/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb +++ b/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb @@ -66,22 +66,25 @@ module FormulaCellarChecks return unless formula.prefix.directory? keg = Keg.new(formula.prefix) - DatabaseCache.new(:linkage) { |database_cache| LinkageChecker.new(keg, database_cache, false, formula) } + DatabaseCache.new(:linkage) do |database_cache| + checker = LinkageChecker.new(keg, database_cache, false, formula) - return unless checker.broken_dylibs? - output = <<~EOS - #{formula} has broken dynamic library links: - #{checker.broken_dylibs.to_a * "\n "} - EOS - tab = Tab.for_keg(keg) - if tab.poured_from_bottle - output += <<~EOS - Rebuild this from source with: - brew reinstall --build-from-source #{formula} - If that's successful, file an issue#{formula.tap ? " here:\n #{formula.tap.issues_url}" : "."} + return unless checker.broken_dylibs? + output = <<~EOS + #{formula} has broken dynamic library links: + #{checker.broken_dylibs.to_a * "\n "} EOS + + tab = Tab.for_keg(keg) + if tab.poured_from_bottle + output += <<~EOS + Rebuild this from source with: + brew reinstall --build-from-source #{formula} + If that's successful, file an issue#{formula.tap ? " here:\n #{formula.tap.issues_url}" : "."} + EOS + end + problem_if_output output end - problem_if_output output end def audit_installed