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

uses: use Formula#full_name

Browse Source
This commit is contained in:
Xu Cheng 2015-05-28 19:13:56 +08:00
parent 082ce482fc
commit 932afdd9be
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/cmd/uses.rb
View File

@ -25,8 +25,8 @@ module Homebrew
reqs = f.recursive_requirements do |dependent, req| reqs = f.recursive_requirements do |dependent, req|
Requirement.prune if ignores.any? { |ignore| req.send(ignore) } && !dependent.build.with?(req) Requirement.prune if ignores.any? { |ignore| req.send(ignore) } && !dependent.build.with?(req)
end end
deps.any? { |dep| dep.to_formula.name == ff.name } || deps.any? { |dep| dep.to_formula.full_name == ff.full_name } ||
reqs.any? { |req| req.name == ff.name || req.class.default_formula == ff.name } reqs.any? { |req| req.name == ff.name || [ff.name, ff.full_name].include?(req.class.default_formula) }
else else
deps = f.deps.reject do |dep| deps = f.deps.reject do |dep|
ignores.any? { |ignore| dep.send(ignore) } ignores.any? { |ignore| dep.send(ignore) }
@ -34,8 +34,8 @@ module Homebrew
reqs = f.requirements.reject do |req| reqs = f.requirements.reject do |req|
ignores.any? { |ignore| req.send(ignore) } ignores.any? { |ignore| req.send(ignore) }
end end
deps.any? { |dep| dep.to_formula.name == ff.name } || deps.any? { |dep| dep.to_formula.full_name == ff.full_name } ||
reqs.any? { |req| req.name == ff.name || req.class.default_formula == ff.name } reqs.any? { |req| req.name == ff.name || [ff.name, ff.full_name].include?(req.class.default_formula) }
end end
rescue FormulaUnavailableError rescue FormulaUnavailableError
# Silently ignore this case as we don't care about things used in # Silently ignore this case as we don't care about things used in
@ -44,6 +44,6 @@ module Homebrew
end end
end end
puts_columns uses.map(&:name) puts_columns uses.map(&:full_name)
end end
end end