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

upgrade: Move logic to find outdated formulae into upgrade method

Browse Source
This commit is contained in:
William Ma 2020-07-06 17:23:31 -04:00 committed by Jonathan Chang
parent 210d22e819
commit ad04284a20
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,17 +63,22 @@ module Homebrew
def upgrade def upgrade
upgrade_args.parse upgrade_args.parse
formulae, casks = args.resolved_formulae_casks
upgrade_outdated_formulae(formulae)
upgrade_outdated_casks(casks)
end
def upgrade_outdated_formulae(formulae)
FormulaInstaller.prevent_build_flags unless DevelopmentTools.installed? FormulaInstaller.prevent_build_flags unless DevelopmentTools.installed?
Install.perform_preinstall_checks Install.perform_preinstall_checks
if args.no_named? if formulae.blank?
outdated = Formula.installed.select do |f| outdated = Formula.installed.select do |f|
f.outdated?(fetch_head: args.fetch_HEAD?) f.outdated?(fetch_head: args.fetch_HEAD?)
end end
casks = [] # Upgrade all installed casks
else else
formulae, casks = args.resolved_formulae_casks
outdated, not_outdated = formulae.partition do |f| outdated, not_outdated = formulae.partition do |f|
f.outdated?(fetch_head: args.fetch_HEAD?) f.outdated?(fetch_head: args.fetch_HEAD?)
end end
@ -89,11 +94,6 @@ module Homebrew
end end
end end
upgrade_outdated_formulae(outdated)
upgrade_outdated_casks(casks)
end
def upgrade_outdated_formulae(outdated)
return if outdated.empty? return if outdated.empty?
pinned = outdated.select(&:pinned?) pinned = outdated.select(&:pinned?)