From 91a47a9ed6d85c1bf8f507cdfef4462a07f61831 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Mon, 18 Jul 2016 18:07:00 +0800 Subject: LinkageChecker: simplify logic (#538) BuiltOptions#without? already handles the option_names for dependencies. Also check disabled recommended deps.--- Library/Homebrew/os/mac/linkage_checker.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Library') diff --git a/Library/Homebrew/os/mac/linkage_checker.rb b/Library/Homebrew/os/mac/linkage_checker.rb index 8bf092323..a992f3d10 100644 --- a/Library/Homebrew/os/mac/linkage_checker.rb +++ b/Library/Homebrew/os/mac/linkage_checker.rb @@ -53,7 +53,8 @@ class LinkageChecker def check_undeclared_deps filter_out = proc do |dep| next true if dep.build? - dep.optional? && !dep.option_names.any? { |n| formula.build.with?(n) } + next false unless dep.optional? || dep.recommended? + formula.build.without?(dep) end declared_deps = formula.deps.reject { |dep| filter_out.call(dep) }.map(&:name) declared_requirement_deps = formula.requirements.reject { |req| filter_out.call(req) }.map(&:default_formula).compact -- cgit v1.2.3