From ad04284a200a017615db466bf633a4299740d79a Mon Sep 17 00:00:00 2001 From: William Ma Date: Mon, 6 Jul 2020 17:23:31 -0400 Subject: [PATCH] upgrade: Move logic to find outdated formulae into upgrade method --- Library/Homebrew/cmd/upgrade.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index b313b57bf4..6d4730759e 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -63,17 +63,22 @@ module Homebrew def upgrade 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? Install.perform_preinstall_checks - if args.no_named? + if formulae.blank? outdated = Formula.installed.select do |f| f.outdated?(fetch_head: args.fetch_HEAD?) end - casks = [] # Upgrade all installed casks else - formulae, casks = args.resolved_formulae_casks outdated, not_outdated = formulae.partition do |f| f.outdated?(fetch_head: args.fetch_HEAD?) end @@ -89,11 +94,6 @@ module Homebrew end end - upgrade_outdated_formulae(outdated) - upgrade_outdated_casks(casks) - end - - def upgrade_outdated_formulae(outdated) return if outdated.empty? pinned = outdated.select(&:pinned?)