diff options
| author | Mike McQuaid | 2016-12-09 17:59:08 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2016-12-09 17:59:08 +0000 |
| commit | 8e2f0ccdc3d56bd30c7db3a4e7fdd5199405bf75 (patch) | |
| tree | e60f778d2cdc548fd94b97da8100bf34ae02e91b | |
| parent | 33b34b497c673e4a18fa332c82b9301dc784fffa (diff) | |
| download | brew-8e2f0ccdc3d56bd30c7db3a4e7fdd5199405bf75.tar.bz2 | |
formulary: remap deprecated options from keg.
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.
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/formulary.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 19b619625..1eae668a4 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -467,7 +467,6 @@ class FormulaInstaller fi = DependencyInstaller.new(df) fi.options |= tab.used_options - fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) fi.options |= inherited_options fi.options &= df.options fi.build_from_source = ARGV.build_formula_from_source?(df) diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index 772f4c902..8d9633e3c 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -276,6 +276,7 @@ class Formulary end end 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 end |