From 1539fda3e8d5107aba92191527e86cd85fb1df35 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Fri, 27 Mar 2015 23:51:52 +0800 Subject: Silently ignore FormulaUnavailableError in check_conflicts If the formula name is in full-qualified name. Let's silently ignore it as we don't care about things used in taps that aren't currently tapped. Closes Homebrew/homebrew#38089. Signed-off-by: Xu Cheng --- Library/Homebrew/formula_installer.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 1e6903be6..515239da7 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -192,8 +192,15 @@ class FormulaInstaller return if ARGV.force? conflicts = formula.conflicts.select do |c| - f = Formulary.factory(c.name) - f.linked_keg.exist? && f.opt_prefix.exist? + begin + f = Formulary.factory(c.name) + f.linked_keg.exist? && f.opt_prefix.exist? + rescue FormulaUnavailableError + raise unless c.name =~ HOMEBREW_TAP_FORMULA_REGEX + # If the formula name is in full-qualified name. Let's silently + # ignore it as we don't care about things used in taps that aren't + # currently tapped. + end end raise FormulaConflictError.new(formula, conflicts) unless conflicts.empty? -- cgit v1.2.3