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

Revert Library/Homebrew/cmd/install.rb to 4b320eec.

Browse Source 
* Fix problem when install exception got swallow and reinstall thinks it
  succeeded.
This commit is contained in:
Xiyue Deng 2013-09-05 12:24:21 -07:00
parent fad1df9359
commit 896173a999
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/cmd/install.rb
View File

@ -19,7 +19,13 @@ module Homebrew extend self
end unless ARGV.force? end unless ARGV.force?
perform_preinstall_checks 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 end
def check_ppc def check_ppc
@ -80,7 +86,6 @@ module Homebrew extend self
# another formula. In that case, don't generate an error, just move on. # another formula. In that case, don't generate an error, just move on.
rescue FormulaAlreadyInstalledError => e rescue FormulaAlreadyInstalledError => e
opoo e.message opoo e.message
rescue CannotInstallFormulaError => e # Ignore CannotInstallFormulaError and let caller handle it.
ofail e.message
end end
end end