From 42681b51f83193f0fb9c178c85e2d1b17926ebd2 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 9 Jan 2016 12:00:35 +0000 Subject: formula_installer: build formula options better. Previously we got all the options based on the build, any inherited options, any passed options and the tab. We want to make sure that these then exclude any options that don't exist as, otherwise, passing an option that doesn't exist (or has been deleted) is enough to stop a bottle being poured. This was particularly nasty on upgrades where we deleted options and one left in the tab would stop the bottle being poured. Closes Homebrew/homebrew#47891. Signed-off-by: Mike McQuaid --- Library/Homebrew/formula_installer.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'Library') diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index af1922150..3202ef8a6 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -353,6 +353,7 @@ class FormulaInstaller args = dependent.build.used_options args |= dependent == formula ? options : inherited_options args |= Tab.for_formula(dependent).used_options + args &= dependent.options BuildOptions.new(args, dependent.options) end -- cgit v1.2.3