admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Regard any installation of the formula as conflicts

Browse Source 
Closes Homebrew/homebrew#34159.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
aereal 2014-11-13 22:56:31 +09:00 committed by Jack Nagel
parent da3c9a1e16
commit 91ccd8435c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formula_installer.rb
View File

@ -201,9 +201,9 @@ class FormulaInstaller
def check_conflicts def check_conflicts
return if ARGV.force? return if ARGV.force?
conflicts = formula.conflicts.reject do |c| conflicts = formula.conflicts.select do |c|
keg = Formulary.factory(c.name).prefix formula = Formulary.factory(c.name)
not keg.directory? && Keg.new(keg).linked? formula.linked_keg.exist? && formula.opt_prefix.exist?
end end
raise FormulaConflictError.new(formula, conflicts) unless conflicts.empty? raise FormulaConflictError.new(formula, conflicts) unless conflicts.empty?