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

formulary: remap deprecated options from keg.

Browse Source 
When reading a building a formula from a keg (rather than e.g. from
name) then the deprecation options were not remapped correctly as they
are only done in `Tab.for_formula` and not `Tab.for_keg`. Ensure that
after we’ve created the formula that the `used_options` are remapped
correctly.
This commit is contained in:
Mike McQuaid 2016-12-09 17:59:08 +00:00
parent 33b34b497c
commit 8e2f0ccdc3
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/formula_installer.rb
View File

@ -467,7 +467,6 @@ class FormulaInstaller
fi = DependencyInstaller.new(df) fi = DependencyInstaller.new(df)
fi.options |= tab.used_options fi.options |= tab.used_options
fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options)
fi.options |= inherited_options fi.options |= inherited_options
fi.options &= df.options fi.options &= df.options
fi.build_from_source = ARGV.build_formula_from_source?(df) fi.build_from_source = ARGV.build_formula_from_source?(df)

1
Library/Homebrew/formulary.rb
View File

@ -276,6 +276,7 @@ class Formulary
end end
end end
f.build = tab f.build = tab
f.build.used_options = Tab.remap_deprecated_options(f.deprecated_options, tab.used_options).as_flags
f.version.update_commit(keg.version.version.commit) if f.head? && keg.version.head? f.version.update_commit(keg.version.version.commit) if f.head? && keg.version.head?
f f
end end