diff options
| author | Jack Nagel | 2013-12-09 14:36:10 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-12-09 14:36:10 -0600 |
| commit | 08055e1776c166d26bdce0995ee16cfabec392f0 (patch) | |
| tree | dae99dc2463cf899f2eb8d05df217b1be64b9d77 /Library/Homebrew/formula_installer.rb | |
| parent | 901902b53b7b47ed9e941f585738e17b034c98c2 (diff) | |
| download | brew-08055e1776c166d26bdce0995ee16cfabec392f0.tar.bz2 | |
Ensure option names are consistent for default formula requirements
Diffstat (limited to 'Library/Homebrew/formula_installer.rb')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index b838f2d54..1baa93c1e 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -180,7 +180,7 @@ class FormulaInstaller def check_requirements unsatisfied = ARGV.filter_for_dependencies do f.recursive_requirements do |dependent, req| - if (req.optional? || req.recommended?) && dependent.build.without?(req.name) + if (req.optional? || req.recommended?) && dependent.build.without?(req) Requirement.prune elsif req.build? && install_bottle?(dependent) Requirement.prune @@ -208,7 +208,7 @@ class FormulaInstaller Dependency.expand(f, deps) do |dependent, dep| dep.universal! if f.build.universal? && !dep.build? - if (dep.optional? || dep.recommended?) && dependent.build.without?(dep.name) + if (dep.optional? || dep.recommended?) && dependent.build.without?(dep) Dependency.prune elsif dep.build? && dependent == f && pour_bottle Dependency.prune |