formula_installer: improve empty installation detection

Use FormulaAuditor.audit_prefix_has_contents from audit.rb, which has
better logic.

Closes Homebrew/homebrew#47678.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Zhiming Wang 2016-01-04 08:47:32 -08:00 committed by Mike McQuaid
parent f0d1444980
commit 6826cd68da

View File

@ -8,6 +8,7 @@ require "caveats"
require "cleaner"
require "formula_cellar_checks"
require "install_renamed"
require "cmd/audit"
require "cmd/postinstall"
require "hooks/bottles"
require "debrew"
@ -572,7 +573,11 @@ class FormulaInstaller
end
end
raise "Empty installation" if Dir["#{formula.prefix}/*"].empty?
auditor = FormulaAuditor.new(formula)
auditor.audit_prefix_has_contents
unless formula.prefix.exist? && auditor.problems.empty?
raise "Empty installation"
end
rescue Exception
ignore_interrupts do