diff options
| author | Xiyue Deng | 2013-09-05 12:24:21 -0700 |
|---|---|---|
| committer | Xiyue Deng | 2013-09-05 12:24:21 -0700 |
| commit | 896173a999df31b60c634706e0cc70d35bd858c5 (patch) | |
| tree | 6466ecdb16b7eeefac1a0a4d7c362ea2f3c6288a /Library | |
| parent | fad1df935915c02688b4688936ebe392fb120957 (diff) | |
| download | brew-896173a999df31b60c634706e0cc70d35bd858c5.tar.bz2 | |
Revert Library/Homebrew/cmd/install.rb to 4b320eec.
* Fix problem when install exception got swallow and reinstall thinks it
succeeded.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 46bc59b91..2fe22cfa4 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 |
