From 3fb38ea69eedce9c24b264b0c3218ad7cd78746f Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 23 Oct 2013 14:02:51 +0100
Subject: [PATCH] formula_installer: further fix tab file handling.

Closes Homebrew/homebrew#23477.
---
 Library/Homebrew/formula_installer.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 0a6277384c..7e5101f869 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -203,7 +203,7 @@ class FormulaInstaller
         @poured_bottle = true
         tab = Tab.for_keg f.prefix
         tab.poured_from_bottle = true
-        tab.tabfile.delete rescue nil
+        tab.tabfile.delete if tab.tabfile
         tab.write
       end
     rescue
@@ -533,8 +533,8 @@ class FormulaInstaller
     stdlibs = Keg.new(f.prefix).detect_cxx_stdlibs
     return if stdlibs.empty?
 
-    tab = Tab.for_formula(f)
-    tab.tabfile.unlink if tab.tabfile
+    tab = Tab.for_keg f.prefix
+    tab.tabfile.delete if tab.tabfile
     # It's technically possible for the same lib to link to multiple C++ stdlibs,
     # but very bad news. Right now we don't track this woeful scenario.
     tab.stdlib = stdlibs.first