admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Remove unnecessary parameter from inherited_options_for

Browse Source
This commit is contained in:
Jack Nagel 2014-03-02 14:02:17 -06:00
parent 8a014b3221
commit 0eefded983
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula_installer.rb
View File

@ -247,7 +247,7 @@ class FormulaInstaller
expanded_deps = ARGV.filter_for_dependencies do expanded_deps = ARGV.filter_for_dependencies do
Dependency.expand(f, deps) do |dependent, dep| Dependency.expand(f, deps) do |dependent, dep|
options = inherited_options[dep] = inherited_options_for(f, dep) options = inherited_options[dep] = inherited_options_for(dep)
if (dep.optional? || dep.recommended?) && dependent.build.without?(dep) if (dep.optional? || dep.recommended?) && dependent.build.without?(dep)
Dependency.prune Dependency.prune
@ -266,7 +266,7 @@ class FormulaInstaller
expanded_deps.map { |dep| [dep, inherited_options[dep]] } expanded_deps.map { |dep| [dep, inherited_options[dep]] }
end end
def inherited_options_for(f, dep) def inherited_options_for(dep)
options = Options.new options = Options.new
if f.build.universal? && !dep.build? && dep.to_formula.build.has_option?("universal") if f.build.universal? && !dep.build? && dep.to_formula.build.has_option?("universal")
options << Option.new("universal") options << Option.new("universal")