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

Merge pull request #18330 from Homebrew/package-conflicts-message-quiet

Browse Source 
cli/named_args: silence `package_conflicts_message` with `--quiet`
This commit is contained in:
Mike McQuaid 2024-09-16 17:00:04 +01:00 committed by GitHub
commit 8fd78bffce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/cli/named_args.rb
View File

@ -231,11 +231,13 @@ module Homebrew
Failed to load cask: #{name} Failed to load cask: #{name}
#{unreadable_error} #{unreadable_error}
EOS EOS
opoo package_conflicts_message(name, "formula", cask) opoo package_conflicts_message(name, "formula", cask) unless Context.current.quiet?
end end
return formula_or_kegs return formula_or_kegs
elsif cask elsif cask
opoo package_conflicts_message(name, "cask", formula_or_kegs) if formula_or_kegs if formula_or_kegs && !Context.current.quiet?
opoo package_conflicts_message(name, "cask", formula_or_kegs)
end
return cask return cask
end end
end end
@ -519,6 +521,7 @@ module Homebrew
nil nil
end end
return unless available return unless available
return if Context.current.quiet?
opoo package_conflicts_message(ref, loaded_type, cask) opoo package_conflicts_message(ref, loaded_type, cask)
end end