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

Build install summary in a separate method and print all at once

Browse Source 
This prevents interleaved output, e.g. when running with Ruby warnings
turned on.
This commit is contained in:
Jack Nagel 2013-12-12 15:42:31 -06:00
parent 3516bb68d3
commit bc3ebd8343
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/formula_installer.rb
View File

@ -319,16 +319,23 @@ class FormulaInstaller
post_install
ohai "Summary" if ARGV.verbose? or show_summary_heading
unless ENV['HOMEBREW_NO_EMOJI']
print "#{ENV['HOMEBREW_INSTALL_BADGE'] || "\xf0\x9f\x8d\xba"} " if MacOS.version >= :lion
end
print "#{f.prefix}: #{f.prefix.abv}"
print ", built in #{pretty_duration build_time}" if build_time
puts
puts summary
ensure
unlock if hold_locks?
end
def emoji
ENV['HOMEBREW_INSTALL_BADGE'] || "\xf0\x9f\x8d\xba"
end
def summary
s = ""
s << "#{emoji} " if MacOS.version >= :lion and not ENV['HOMEBREW_NO_EMOJI']
s << "#{f.prefix}: #{f.prefix.abv}"
s << ", built in #{pretty_duration build_time}" if build_time
s
end
def build_time
@build_time ||= Time.now - @start_time unless pour_bottle? or ARGV.interactive? or @start_time.nil?
end