From 4bde62b651a3d08543f54660871cafb0ae8c0da7 Mon Sep 17 00:00:00 2001 From: Boris Klimenko <2@borisklimenko.ru> Date: Wed, 26 Feb 2020 15:56:45 +0300 Subject: [PATCH] Apply suggestions from code review Co-Authored-By: Mike McQuaid --- Library/Homebrew/cmd/upgrade.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index e1e9b9e5e5..205ddf7cd0 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -185,12 +185,13 @@ module Homebrew end fi.prelude - if f.optlinked? - oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{Keg.new(f.opt_prefix).version} ->"\ + upgrade_version = if f.optlinked? + "#{Keg.new(f.opt_prefix).version} -> #{f.pkg_version}" " #{f.pkg_version} #{fi.options.to_a.join " "}" else - oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} -> #{f.pkg_version} #{fi.options.to_a.join " "}" + "-> #{f.pkg_version}" end + oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{upgrade_version} #{fi.options.to_a.join(" ")}" # first we unlink the currently active keg for this formula otherwise it is # possible for the existing build to interfere with the build we are about to