From ca2680d77f312ec8bd8c06467adb1d5077fbed81 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 17 Oct 2014 22:40:03 -0500 Subject: [PATCH] Move some code to the pour method --- Library/Homebrew/formula_installer.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 0cc50ac826..f180a1663a 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -158,15 +158,6 @@ class FormulaInstaller if pour_bottle? :warn => true pour @poured_bottle = true - - CxxStdlib.check_compatibility( - f, f.recursive_dependencies, - Keg.new(f.prefix), MacOS.default_compiler - ) - - tab = Tab.for_keg f.prefix - tab.poured_from_bottle = true - tab.write end rescue => e raise e if ARGV.homebrew_developer? @@ -628,6 +619,15 @@ class FormulaInstaller path.cp_path_sub(f.bottle_prefix, HOMEBREW_PREFIX) end FileUtils.rm_rf f.bottle_prefix + + CxxStdlib.check_compatibility( + f, f.recursive_dependencies, + Keg.new(f.prefix), MacOS.default_compiler + ) + + tab = Tab.for_keg(f.prefix) + tab.poured_from_bottle = true + tab.write end def audit_check_output(output)