diff options
| author | Xu Cheng | 2016-07-18 18:07:00 +0800 |
|---|---|---|
| committer | GitHub | 2016-07-18 18:07:00 +0800 |
| commit | 91a47a9ed6d85c1bf8f507cdfef4462a07f61831 (patch) | |
| tree | 898064f01a3be083ce7c03f9828016d454f043da | |
| parent | a3a6a8381d1fe6f4f4e1fed6d7ce84d30b556143 (diff) | |
| download | brew-91a47a9ed6d85c1bf8f507cdfef4462a07f61831.tar.bz2 | |
LinkageChecker: simplify logic (#538)
BuiltOptions#without? already handles the option_names for dependencies.
Also check disabled recommended deps.
| -rw-r--r-- | Library/Homebrew/os/mac/linkage_checker.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |
