diff options
| author | aereal | 2014-11-13 22:56:31 +0900 |
|---|---|---|
| committer | Jack Nagel | 2014-11-17 13:30:54 -0600 |
| commit | 91ccd8435c6f19e9937b6aff5946e86f1eb63c05 (patch) | |
| tree | 5ae0a69d55a9715eb628b99f61e7d352c5e63a39 /Library | |
| parent | da3c9a1e167ec4f1d819bae0296e4567c3425078 (diff) | |
| download | brew-91ccd8435c6f19e9937b6aff5946e86f1eb63c05.tar.bz2 | |
Regard any installation of the formula as conflicts
Closes Homebrew/homebrew#34159.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
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? |