aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorilovezfs2017-07-02 06:48:39 -0700
committerGitHub2017-07-02 06:48:39 -0700
commitf012660489529bf8b4ffc436b33ed0af5e5af404 (patch)
tree0d477fcef4f8d51ff704e80a1ab56f02572bac57
parent2b3717a5a0452271bb7dcfcdfa2680714ac99c2a (diff)
parent418f5786011edd6bb0ca2c9428f0f3b0005d6bf6 (diff)
downloadbrew-f012660489529bf8b4ffc436b33ed0af5e5af404.tar.bz2
Merge pull request #2850 from ilovezfs/software-spec-rescue-unavailable
software_spec: rescue TapFormulaUnavailableError in recursive_dependencies
-rw-r--r--Library/Homebrew/software_spec.rb13
1 files changed, 11 insertions, 2 deletions
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index dd6cea8b2..0d2b48acc 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -161,8 +161,17 @@ class SoftwareSpec
end
def recursive_dependencies
- recursive_dependencies = deps
- deps.map(&:to_formula).compact.uniq.each do |f|
+ deps_f = []
+ recursive_dependencies = deps.map do |dep|
+ begin
+ deps_f << dep.to_formula
+ dep
+ rescue TapFormulaUnavailableError
+ # Don't complain about missing cross-tap dependencies
+ next
+ end
+ end.compact.uniq
+ deps_f.compact.each do |f|
f.recursive_dependencies.each do |dep|
recursive_dependencies << dep unless recursive_dependencies.include?(dep)
end