aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorJack Nagel2012-03-23 13:05:08 -0500
committerJack Nagel2012-03-23 13:05:08 -0500
commit1bc631369494433714c5174dcd51511078377980 (patch)
tree3fa4ae7f1e42b4bea295f3be33aa591918f3125e /Library/Homebrew/cmd
parent9076037a0df37f79d0556bac683cc3b1c9742fe6 (diff)
downloadbrew-1bc631369494433714c5174dcd51511078377980.tar.bz2
Pass the tab to FormulaInstaller
Callers of FormulaInstaller now usually unlink the existing keg prior to running the installer. However, Tab.for_formula uses the LinkedKeg record to obtain the tab. Since we need the tab to persist install options across upgrades, we must start creating the Tab object before unlinking the old keg and passing it to the FormulaInstaller. Fixes Homebrew/homebrew#11086. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/upgrade.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 9777c5ce5..671188a3c 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -49,9 +49,10 @@ module Homebrew extend self
end
def upgrade_formula f
+ tab = Tab.for_formula(f)
outdated_keg = Keg.new(f.linked_keg.realpath) rescue nil
- installer = FormulaInstaller.new f
+ installer = FormulaInstaller.new(f, tab)
installer.show_header = false
oh1 "Upgrading #{f.name}"