From 896173a999df31b60c634706e0cc70d35bd858c5 Mon Sep 17 00:00:00 2001 From: Xiyue Deng Date: Thu, 5 Sep 2013 12:24:21 -0700 Subject: [PATCH] Revert Library/Homebrew/cmd/install.rb to 4b320eec. * Fix problem when install exception got swallow and reinstall thinks it succeeded. --- Library/Homebrew/cmd/install.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 46bc59b91e..2fe22cfa48 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -19,7 +19,13 @@ module Homebrew extend self end unless ARGV.force? perform_preinstall_checks - ARGV.formulae.each { |f| install_formula(f) } + ARGV.formulae.each do |f| + begin + install_formula(f) + rescue CannotInstallFormulaError => e + ofail e.message + end + end end def check_ppc @@ -80,7 +86,6 @@ module Homebrew extend self # another formula. In that case, don't generate an error, just move on. rescue FormulaAlreadyInstalledError => e opoo e.message - rescue CannotInstallFormulaError => e - ofail e.message + # Ignore CannotInstallFormulaError and let caller handle it. end end