aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-10-17 22:40:03 -0500
committerJack Nagel2014-10-17 22:40:03 -0500
commitca2680d77f312ec8bd8c06467adb1d5077fbed81 (patch)
treec5c7398cdec3b7a3b7c5dd31bf5fcf5ee2a8cba9 /Library
parentb0f51ac744e411d2d82c5f48577c5f2cbbc7b5f0 (diff)
downloadbrew-ca2680d77f312ec8bd8c06467adb1d5077fbed81.tar.bz2
Move some code to the pour method
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula_installer.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 0cc50ac82..f180a1663 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)