aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorZhiming Wang2016-01-04 08:47:32 -0800
committerMike McQuaid2016-01-09 10:22:31 +0000
commit6826cd68da17560e8440b880c05741a5820358a6 (patch)
treed7d371ad9e77c7b218274a0790159dbbc9e73edb /Library
parentf0d1444980470824b56ba490b9221476440017b6 (diff)
downloadbrew-6826cd68da17560e8440b880c05741a5820358a6.tar.bz2
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>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula_installer.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 8fae10137..e5fd590b7 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -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