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

Revert "Use the dependency object as the key in the inherited_options hash"

Browse Source 
This reverts commit c8d3b39165bb11799d7849ee13a3559ad0bd63f4.
This commit is contained in:
Jack Nagel 2014-08-24 16:14:16 -05:00
parent 1ef2819979
commit ccf37d5ac0
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

@ -278,7 +278,7 @@ class FormulaInstaller
inherited_options = {} inherited_options = {}
expanded_deps = Dependency.expand(f, deps) do |dependent, dep| expanded_deps = Dependency.expand(f, deps) do |dependent, dep|
options = inherited_options[dep] = inherited_options_for(dep) options = inherited_options[dep.name] = inherited_options_for(dep)
build = effective_build_options_for( build = effective_build_options_for(
dependent, dependent,
inherited_options.fetch(dependent.name, []) inherited_options.fetch(dependent.name, [])
@ -295,7 +295,7 @@ class FormulaInstaller
end end
end end
expanded_deps.map { |dep| [dep, inherited_options[dep]] } expanded_deps.map { |dep| [dep, inherited_options[dep.name]] }
end end
def effective_build_options_for(dependent, inherited_options=[]) def effective_build_options_for(dependent, inherited_options=[])