diff options
| author | Jack Nagel | 2014-07-01 21:57:30 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-07-01 21:57:30 -0500 |
| commit | 3236e231cba16658a26005183ec1cd0ae7ac6bee (patch) | |
| tree | 495b83cad00efb1ef0bf1bca68082fcb48ba7df4 /Library | |
| parent | 5809710a8309a5b6960051e8a569abc78bb070f2 (diff) | |
| download | homebrew-3236e231cba16658a26005183ec1cd0ae7ac6bee.tar.bz2 | |
Use predicate methods instead of inspecting the tags array
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/audit.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/cxxstdlib.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/requirements/python_dependency.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb index 67d9faec1..ad4132726 100644 --- a/Library/Homebrew/cmd/audit.rb +++ b/Library/Homebrew/cmd/audit.rb @@ -148,9 +148,9 @@ class FormulaAuditor dep.options.reject do |opt| next true if dep_f.build.has_option?(opt.name) dep_f.requirements.detect do |r| - if r.tags.include? :recommended + if r.recommended? opt.name == "with-#{r.name}" - elsif r.tags.include? :optional + elsif r.optional? opt.name == "without-#{r.name}" end end diff --git a/Library/Homebrew/cxxstdlib.rb b/Library/Homebrew/cxxstdlib.rb index 1ae50c674..7525f6ab9 100644 --- a/Library/Homebrew/cxxstdlib.rb +++ b/Library/Homebrew/cxxstdlib.rb @@ -38,7 +38,7 @@ class CxxStdlib # Software is unlikely to link against anything from its # buildtime deps, so it doesn't matter at all if they link # against different C++ stdlibs - next if dep.tags.include? :build + next if dep.build? dep_stdlib = Tab.for_formula(dep.to_formula).cxxstdlib if !compatible_with? dep_stdlib diff --git a/Library/Homebrew/requirements/python_dependency.rb b/Library/Homebrew/requirements/python_dependency.rb index e5e75abf7..d5294c1e3 100644 --- a/Library/Homebrew/requirements/python_dependency.rb +++ b/Library/Homebrew/requirements/python_dependency.rb @@ -14,7 +14,7 @@ class PythonDependency < Requirement end def pour_bottle? - tags.include?(:build) || system_python? + build? || system_python? end def modify_build_environment |
