diff options
| -rw-r--r-- | Library/Homebrew/exceptions.rb | 5 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb index 66ae2b294..28b46198e 100644 --- a/Library/Homebrew/exceptions.rb +++ b/Library/Homebrew/exceptions.rb @@ -35,10 +35,7 @@ module Homebrew class InstallationError < RuntimeError attr :formula - def initialize formula - @formula = formula - end - def initialize formula, message + def initialize formula, message="" super message @formula = formula end diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 06847dfbc..497f2a2ef 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -13,15 +13,15 @@ class FormulaInstaller def go if @f.installed? and not ARGV.force? raise FormulaAlreadyInstalledError, @f - else - unless ignore_deps - @f.recursive_deps.each do |dep| - FormulaInstaller.install_formula dep unless dep.installed? - end - FormulaInstaller.check_external_deps @f + end + + unless ignore_deps + @f.recursive_deps.each do |dep| + FormulaInstaller.install_formula dep unless dep.installed? end - FormulaInstaller.install_formula @f + FormulaInstaller.check_external_deps @f end + FormulaInstaller.install_formula @f end def self.check_external_deps f |