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

uses: rescue TapFormulaAmbiguityError caused by Dependency#to_formula

Browse Source 
Fixes Homebrew/homebrew#40636.
This commit is contained in:
Xu Cheng 2015-06-14 14:35:44 +08:00
parent 357648a8c4
commit 3ded175241
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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