admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

formula_installer: further fix tab file handling.

Browse Source 
Closes Homebrew/homebrew#23477.
This commit is contained in:
Mike McQuaid 2013-10-23 14:02:51 +01:00
parent 57e541f040
commit 3fb38ea69e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formula_installer.rb
View File

@ -203,7 +203,7 @@ class FormulaInstaller
@poured_bottle = true @poured_bottle = true
tab = Tab.for_keg f.prefix tab = Tab.for_keg f.prefix
tab.poured_from_bottle = true tab.poured_from_bottle = true
tab.tabfile.delete rescue nil tab.tabfile.delete if tab.tabfile
tab.write tab.write
end end
rescue rescue
@ -533,8 +533,8 @@ class FormulaInstaller
stdlibs = Keg.new(f.prefix).detect_cxx_stdlibs stdlibs = Keg.new(f.prefix).detect_cxx_stdlibs
return if stdlibs.empty? return if stdlibs.empty?
tab = Tab.for_formula(f) tab = Tab.for_keg f.prefix
tab.tabfile.unlink if tab.tabfile tab.tabfile.delete if tab.tabfile
# It's technically possible for the same lib to link to multiple C++ stdlibs, # 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. # but very bad news. Right now we don't track this woeful scenario.
tab.stdlib = stdlibs.first tab.stdlib = stdlibs.first