From 5ac4e4f0714ffb364ac528d1a9b6697ae1693bf6 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 23 Jan 2013 00:26:31 -0600 Subject: [PATCH] upgrade: use standard Tab accessor Yes, the formula object does refer to a version that has not yet been installed, but we were not looking into Formula#prefix, but #linked_keg, which is version agnostic (since the original patch was committed, we Tab#for_formula learned to look into #opt_prefix as well). The rest of the logic is already embedded in the Tab accessors. --- Library/Homebrew/cmd/upgrade.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index c63a535fe2..b5effee50d 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -43,10 +43,7 @@ module Homebrew extend self end def upgrade_formula f - # Generate using `for_keg` since the formula object points to a newer version - # that doesn't exist yet. Use `opt_prefix` to guard against keg-only installs. - # Also, guard against old installs that may not have an `opt_prefix` symlink. - tab = (f.opt_prefix.exist? ? Tab.for_keg(f.opt_prefix) : Tab.dummy_tab(f)) + tab = Tab.for_formula(f) outdated_keg = Keg.new(f.linked_keg.realpath) rescue nil installer = FormulaInstaller.new(f)