Fix 'brew install f' for already-installed brews.
This commit is contained in:
parent
5a30768377
commit
bb58511b31
@ -35,10 +35,7 @@ module Homebrew
|
|||||||
class InstallationError < RuntimeError
|
class InstallationError < RuntimeError
|
||||||
attr :formula
|
attr :formula
|
||||||
|
|
||||||
def initialize formula
|
def initialize formula, message=""
|
||||||
@formula = formula
|
|
||||||
end
|
|
||||||
def initialize formula, message
|
|
||||||
super message
|
super message
|
||||||
@formula = formula
|
@formula = formula
|
||||||
end
|
end
|
||||||
|
|||||||
@ -13,15 +13,15 @@ class FormulaInstaller
|
|||||||
def go
|
def go
|
||||||
if @f.installed? and not ARGV.force?
|
if @f.installed? and not ARGV.force?
|
||||||
raise FormulaAlreadyInstalledError, @f
|
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
|
|
||||||
FormulaInstaller.install_formula @f
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
unless ignore_deps
|
||||||
|
@f.recursive_deps.each do |dep|
|
||||||
|
FormulaInstaller.install_formula dep unless dep.installed?
|
||||||
|
end
|
||||||
|
FormulaInstaller.check_external_deps @f
|
||||||
|
end
|
||||||
|
FormulaInstaller.install_formula @f
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.check_external_deps f
|
def self.check_external_deps f
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user