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

formula_installer: improve empty installation detection

Browse Source 
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
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/formula_installer.rb
View File

@ -8,6 +8,7 @@ require "caveats"
require "cleaner" require "cleaner"
require "formula_cellar_checks" require "formula_cellar_checks"
require "install_renamed" require "install_renamed"
require "cmd/audit"
require "cmd/postinstall" require "cmd/postinstall"
require "hooks/bottles" require "hooks/bottles"
require "debrew" require "debrew"
@ -572,7 +573,11 @@ class FormulaInstaller
end end
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 rescue Exception
ignore_interrupts do ignore_interrupts do