From 885022a5e3003e6beff467033983551089726141 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Sat, 9 Jan 2016 18:59:34 +0800 Subject: add Keg#empty_installation? Avoid using `FormulaAuditor` in `FormulaInstaller`. Closes Homebrew/homebrew#47887. Signed-off-by: Xu Cheng --- Library/Homebrew/cmd/audit.rb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'Library/Homebrew/cmd') diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb index f881105a1..3750eaf25 100644 --- a/Library/Homebrew/cmd/audit.rb +++ b/Library/Homebrew/cmd/audit.rb @@ -883,19 +883,13 @@ class FormulaAuditor def audit_prefix_has_contents return unless formula.prefix.directory? - Pathname.glob("#{formula.prefix}/**/*") do |file| - next if file.directory? - basename = file.basename.to_s - next if Metafiles.copy?(basename) - next if %w[.DS_Store INSTALL_RECEIPT.json].include?(basename) - return + if Keg.new(formula.prefix).empty_installation? + problem <<-EOS.undent + The installation seems to be empty. Please ensure the prefix + is set correctly and expected files are installed. + The prefix configure/make argument may be case-sensitive. + EOS end - - problem <<-EOS.undent - The installation seems to be empty. Please ensure the prefix - is set correctly and expected files are installed. - The prefix configure/make argument may be case-sensitive. - EOS end def audit_conditional_dep(dep, condition, line) -- cgit v1.2.3