diff options
| author | Mike McQuaid | 2013-10-23 14:02:51 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2013-10-23 14:02:51 +0100 |
| commit | 3fb38ea69eedce9c24b264b0c3218ad7cd78746f (patch) | |
| tree | 0bdea2ab67d86379a4612a246dad1423bd5e99c7 /Library/Homebrew | |
| parent | 57e541f04059329195c99edb031ffb519d68ed55 (diff) | |
| download | brew-3fb38ea69eedce9c24b264b0c3218ad7cd78746f.tar.bz2 | |
formula_installer: further fix tab file handling.
Closes Homebrew/homebrew#23477.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 0a6277384..7e5101f86 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 |