aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd/install.rb
diff options
context:
space:
mode:
authorJack Nagel2014-03-15 10:40:18 -0500
committerJack Nagel2014-03-15 10:53:03 -0500
commit535889ad62f018e05ec91d1ca828e880b9c9c6ba (patch)
tree3921a9bba2eeea103ca5e3b2f4563e286e9c7e94 /Library/Homebrew/cmd/install.rb
parent7bf8e517ebcad37fb8edc4d0e36d92436dd06f81 (diff)
downloadhomebrew-535889ad62f018e05ec91d1ca828e880b9c9c6ba.tar.bz2
Rewrite `brew reinstall`
Fixes #23928.
Diffstat (limited to 'Library/Homebrew/cmd/install.rb')
-rw-r--r--Library/Homebrew/cmd/install.rb12
1 files changed, 4 insertions, 8 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index a3d7b6452..d1a50e887 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -36,14 +36,9 @@ module Homebrew extend self
end unless ARGV.force?
perform_preinstall_checks
+
begin
- ARGV.formulae.each do |f|
- begin
- install_formula(f)
- rescue CannotInstallFormulaError => e
- ofail e.message
- end
- end
+ ARGV.formulae.each { |f| install_formula(f) }
rescue FormulaUnavailableError => e
ofail e.message
require 'cmd/search'
@@ -124,6 +119,7 @@ module Homebrew extend self
# another formula. In that case, don't generate an error, just move on.
rescue FormulaAlreadyInstalledError => e
opoo e.message
- # Ignore CannotInstallFormulaError and let caller handle it.
+ rescue CannotInstallFormulaError => e
+ ofail e.message
end
end