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

Merge pull request #11509 from issyl0/cask-caveats-in-summary

Browse Source 
cask/installer: Add Cask caveats to the end-of-operation summary
This commit is contained in:
Issy Long 2021-06-10 09:43:14 +01:00 committed by GitHub
commit bf7f2e9a49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cask/installer.rb
View File

@ -56,6 +56,8 @@ module Cask
caveats = cask.caveats caveats = cask.caveats
return if caveats.empty? return if caveats.empty?
Homebrew.messages.record_caveats(cask.token, caveats)
<<~EOS <<~EOS
#{ohai_title "Caveats"} #{ohai_title "Caveats"}
#{caveats} #{caveats}

2
Library/Homebrew/formula_installer.rb
View File

@ -769,7 +769,7 @@ class FormulaInstaller
@show_summary_heading = true @show_summary_heading = true
ohai "Caveats", caveats.to_s ohai "Caveats", caveats.to_s
Homebrew.messages.record_caveats(formula, caveats) Homebrew.messages.record_caveats(formula.name, caveats)
end end
sig { void } sig { void }

6
Library/Homebrew/messages.rb
View File

@ -15,8 +15,8 @@ class Messages
@install_times = [] @install_times = []
end end
def record_caveats(f, caveats) def record_caveats(package, caveats)
@caveats.push(formula: f.name, caveats: caveats) @caveats.push(package: package, caveats: caveats)
end end
def formula_installed(f, elapsed_time) def formula_installed(f, elapsed_time)
@ -36,7 +36,7 @@ class Messages
oh1 "Caveats" oh1 "Caveats"
@caveats.each do |c| @caveats.each do |c|
ohai c[:formula], c[:caveats] ohai c[:package], c[:caveats]
end end
end end