From 932afdd9be7d1ba1de97b7730bb6d58b118eedf5 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Thu, 28 May 2015 19:13:56 +0800 Subject: [PATCH] uses: use Formula#full_name --- Library/Homebrew/cmd/uses.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/cmd/uses.rb b/Library/Homebrew/cmd/uses.rb index 6d42f8e541..7410cc0228 100644 --- a/Library/Homebrew/cmd/uses.rb +++ b/Library/Homebrew/cmd/uses.rb @@ -25,8 +25,8 @@ 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.name == ff.name } || - reqs.any? { |req| req.name == ff.name || req.class.default_formula == ff.name } + deps.any? { |dep| dep.to_formula.full_name == ff.full_name } || + reqs.any? { |req| req.name == ff.name || [ff.name, ff.full_name].include?(req.class.default_formula) } else deps = f.deps.reject do |dep| ignores.any? { |ignore| dep.send(ignore) } @@ -34,8 +34,8 @@ module Homebrew reqs = f.requirements.reject do |req| ignores.any? { |ignore| req.send(ignore) } end - deps.any? { |dep| dep.to_formula.name == ff.name } || - reqs.any? { |req| req.name == ff.name || req.class.default_formula == ff.name } + deps.any? { |dep| dep.to_formula.full_name == ff.full_name } || + reqs.any? { |req| req.name == ff.name || [ff.name, ff.full_name].include?(req.class.default_formula) } end rescue FormulaUnavailableError # Silently ignore this case as we don't care about things used in @@ -44,6 +44,6 @@ module Homebrew end end - puts_columns uses.map(&:name) + puts_columns uses.map(&:full_name) end end