From 3ded1752419fbc48fc1dd29c2fc423517b6f74c0 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Sun, 14 Jun 2015 14:35:44 +0800 Subject: uses: rescue TapFormulaAmbiguityError caused by Dependency#to_formula Fixes Homebrew/homebrew#40636. --- Library/Homebrew/cmd/uses.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/cmd/uses.rb b/Library/Homebrew/cmd/uses.rb index bb6541865..8738db894 100644 --- a/Library/Homebrew/cmd/uses.rb +++ b/Library/Homebrew/cmd/uses.rb @@ -25,7 +25,7 @@ module Homebrew reqs = f.recursive_requirements do |dependent, req| Requirement.prune if ignores.any? { |ignore| req.send(ignore) } && !dependent.build.with?(req) end - deps.any? { |dep| dep.to_formula.full_name == ff.full_name } || + deps.any? { |dep| dep.to_formula.full_name == ff.full_name rescue dep.name == ff.name } || reqs.any? { |req| req.name == ff.name || [ff.name, ff.full_name].include?(req.default_formula) } else deps = f.deps.reject do |dep| @@ -34,7 +34,7 @@ module Homebrew reqs = f.requirements.reject do |req| ignores.any? { |ignore| req.send(ignore) } end - deps.any? { |dep| dep.to_formula.full_name == ff.full_name } || + deps.any? { |dep| dep.to_formula.full_name == ff.full_name rescue dep.name == ff.name } || reqs.any? { |req| req.name == ff.name || [ff.name, ff.full_name].include?(req.default_formula) } end rescue FormulaUnavailableError -- cgit v1.2.3