diff options
| author | Jack Nagel | 2014-08-24 16:14:16 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-08-24 16:14:16 -0500 |
| commit | accf2b83bd6f1bf90d856a156fc658362b636c14 (patch) | |
| tree | f5755ffc00a21492aec53dce83aea1095d9c0079 /Library/Homebrew | |
| parent | c8d3b39165bb11799d7849ee13a3559ad0bd63f4 (diff) | |
| download | homebrew-accf2b83bd6f1bf90d856a156fc658362b636c14.tar.bz2 | |
Revert "Use the dependency object as the key in the inherited_options hash"
This reverts commit c8d3b39165bb11799d7849ee13a3559ad0bd63f4.
Diffstat (limited to 'Library/Homebrew')
| -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 debaffe87..dea717eda 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -278,7 +278,7 @@ class FormulaInstaller inherited_options = {} 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( dependent, inherited_options.fetch(dependent.name, []) @@ -295,7 +295,7 @@ class FormulaInstaller end end - expanded_deps.map { |dep| [dep, inherited_options[dep]] } + expanded_deps.map { |dep| [dep, inherited_options[dep.name]] } end def effective_build_options_for(dependent, inherited_options=[]) |
