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

uses: make skip arguments work for requirement

Browse Source
This commit is contained in:
Xu Cheng 2015-05-19 21:40:04 +08:00
parent 2ea9d7749b
commit cacad69a8e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,14 +22,20 @@ module Homebrew
deps = f.recursive_dependencies.reject do |dep| deps = f.recursive_dependencies.reject do |dep|
ignores.any? { |ignore| dep.send(ignore) } ignores.any? { |ignore| dep.send(ignore) }
end end
reqs = f.recursive_requirements.reject do |req|
ignores.any? { |ignore| req.send(ignore) }
end
deps.any? { |dep| dep.to_formula.name == ff.name } || deps.any? { |dep| dep.to_formula.name == ff.name } ||
f.recursive_requirements.any? { |req| req.name == ff.name || req.class.default_formula == ff.name } reqs.any? { |req| req.name == ff.name || req.class.default_formula == ff.name }
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) }
end end
reqs = f.requirements.reject do |req|
ignores.any? { |ignore| req.send(ignore) }
end
deps.any? { |dep| dep.to_formula.name == ff.name } || deps.any? { |dep| dep.to_formula.name == ff.name } ||
f.requirements.any? { |req| req.name == ff.name || req.class.default_formula == ff.name } reqs.any? { |req| req.name == ff.name || req.class.default_formula == ff.name }
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