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

Respect --newer-only and --quiet in JSON output

Browse Source
This commit is contained in:
Sam Ford 2022-06-08 15:49:38 -04:00
parent 802a430300
commit 52cd5dde9c
No known key found for this signature in database
GPG Key ID: 7AF5CBEE1DD6F76D
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/livecheck/livecheck.rb
View File

@ -245,7 +245,7 @@ module Homebrew
skip_info ||= SkipConditions.skip_information(formula_or_cask, full_name: use_full_name, verbose: verbose) skip_info ||= SkipConditions.skip_information(formula_or_cask, full_name: use_full_name, verbose: verbose)
if skip_info.present? if skip_info.present?
next skip_info if json next skip_info if json && !newer_only
SkipConditions.print_skip_information(skip_info) if !newer_only && !quiet SkipConditions.print_skip_information(skip_info) if !newer_only && !quiet
next next
@ -285,6 +285,7 @@ module Homebrew
if latest.blank? if latest.blank?
no_versions_msg = "Unable to get versions" no_versions_msg = "Unable to get versions"
raise Livecheck::Error, no_versions_msg unless json raise Livecheck::Error, no_versions_msg unless json
next if quiet
next version_info if version_info.is_a?(Hash) && version_info[:status] && version_info[:messages] next version_info if version_info.is_a?(Hash) && version_info[:status] && version_info[:messages]
@ -341,7 +342,7 @@ module Homebrew
if json if json
progress&.increment progress&.increment
status_hash(formula_or_cask, "error", [e.to_s], full_name: use_full_name, verbose: verbose) status_hash(formula_or_cask, "error", [e.to_s], full_name: use_full_name, verbose: verbose) unless quiet
elsif !quiet elsif !quiet
name = formula_or_cask_name(formula_or_cask, full_name: use_full_name) name = formula_or_cask_name(formula_or_cask, full_name: use_full_name)
name += " (cask)" if ambiguous_casks.include?(formula_or_cask) name += " (cask)" if ambiguous_casks.include?(formula_or_cask)