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

Move some code to the pour method

Browse Source
This commit is contained in:
Jack Nagel 2014-10-17 22:40:03 -05:00
parent b0f51ac744
commit ca2680d77f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/formula_installer.rb
View File

@ -158,15 +158,6 @@ class FormulaInstaller
if pour_bottle? :warn => true if pour_bottle? :warn => true
pour pour
@poured_bottle = true @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 end
rescue => e rescue => e
raise e if ARGV.homebrew_developer? raise e if ARGV.homebrew_developer?
@ -628,6 +619,15 @@ class FormulaInstaller
path.cp_path_sub(f.bottle_prefix, HOMEBREW_PREFIX) path.cp_path_sub(f.bottle_prefix, HOMEBREW_PREFIX)
end end
FileUtils.rm_rf f.bottle_prefix 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 end
def audit_check_output(output) def audit_check_output(output)