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

cmd/upgrade: fix cask/formula args (again).

Browse Source 
Fixes https://github.com/Homebrew/brew/issues/8228#issuecomment-670161766
This commit is contained in:
Mike McQuaid 2020-08-07 10:25:29 +01:00
parent e4c9f769a0
commit 863a0964e2
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/upgrade.rb
View File

@ -77,14 +77,16 @@ module Homebrew
# If one or more formulae are specified, but no casks were # If one or more formulae are specified, but no casks were
# specified, we want to make note of that so we don't # specified, we want to make note of that so we don't
# try to upgrade all outdated casks. # try to upgrade all outdated casks.
upgrade_formulae = formulae.present? && casks.blank? && !args.cask? upgrade_formulae = formulae.present? && casks.blank?
upgrade_casks = casks.present? && formulae.blank? && !args.formula? upgrade_casks = casks.present? && formulae.blank?
upgrade_outdated_formulae(formulae, args: args) unless upgrade_casks upgrade_outdated_formulae(formulae, args: args) unless upgrade_casks
upgrade_outdated_casks(casks, args: args) unless upgrade_formulae upgrade_outdated_casks(casks, args: args) unless upgrade_formulae
end end
def upgrade_outdated_formulae(formulae, args:) def upgrade_outdated_formulae(formulae, args:)
return if args.cask?
FormulaInstaller.prevent_build_flags(args) FormulaInstaller.prevent_build_flags(args)
Install.perform_preinstall_checks Install.perform_preinstall_checks
@ -143,6 +145,8 @@ module Homebrew
end end
def upgrade_outdated_casks(casks, args:) def upgrade_outdated_casks(casks, args:)
return if args.formula?
Cask::Cmd::Upgrade.upgrade_casks( Cask::Cmd::Upgrade.upgrade_casks(
*casks, *casks,
force: args.force?, force: args.force?,