diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 23813c3e6..fe3a00fd2 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -201,9 +201,9 @@ class FormulaInstaller def check_conflicts return if ARGV.force? - conflicts = formula.conflicts.reject do |c| - keg = Formulary.factory(c.name).prefix - not keg.directory? && Keg.new(keg).linked? + conflicts = formula.conflicts.select do |c| + formula = Formulary.factory(c.name) + formula.linked_keg.exist? && formula.opt_prefix.exist? end raise FormulaConflictError.new(formula, conflicts) unless conflicts.empty? |