diff options
| author | Xu Cheng | 2015-06-14 14:35:44 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-06-15 12:55:47 +0800 |
| commit | 3ded1752419fbc48fc1dd29c2fc423517b6f74c0 (patch) | |
| tree | a59b91a8b410ccb8ad631aedf608191b19b82ca8 /Library/Homebrew | |
| parent | 357648a8c404766840e9fe05ad3a3edf96411dae (diff) | |
| download | brew-3ded1752419fbc48fc1dd29c2fc423517b6f74c0.tar.bz2 | |
uses: rescue TapFormulaAmbiguityError caused by Dependency#to_formula
Fixes Homebrew/homebrew#40636.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/uses.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |