Tab#with? accepts the same types as BuildOptions#with?

This commit is contained in:
Jack Nagel 2014-10-09 00:20:15 -05:00
parent 5247f44205
commit 285f8f77e6
4 changed files with 5 additions and 8 deletions

View File

@ -9,11 +9,7 @@ class BuildOptions
end
def with? val
if val.respond_to?(:option_name)
name = val.option_name
else
name = val
end
name = val.respond_to?(:option_name) ? val.option_name : val
if option_defined? "with-#{name}"
include? "with-#{name}"

View File

@ -13,7 +13,7 @@ module Homebrew
f.deps.each do |dep|
if dep.optional? || dep.recommended?
deps << dep.to_formula.name if tab.with?(dep.to_formula.name)
deps << dep.to_formula.name if tab.with?(dep)
else
deps << dep.to_formula.name
end

View File

@ -8,7 +8,7 @@ module Homebrew
missing_deps = f.recursive_dependencies do |dependent, dep|
if dep.optional? || dep.recommended?
tab = Tab.for_formula(dependent)
Dependency.prune unless tab.with?(dep.name)
Dependency.prune unless tab.with?(dep)
elsif dep.build?
Dependency.prune
end

View File

@ -81,7 +81,8 @@ class Tab < OpenStruct
:compiler => :clang
end
def with? name
def with? val
name = val.respond_to?(:option_name) ? val.option_name : val
include?("with-#{name}") || unused_options.include?("without-#{name}")
end