From da5d804bd9fca474eb2a7f484559ad9cd1534d89 Mon Sep 17 00:00:00 2001 From: Boris Klimenko <2@borisklimenko.ru> Date: Wed, 26 Feb 2020 13:42:18 +0300 Subject: [PATCH 1/4] Inline versions of upgraded formulae --- Library/Homebrew/cmd/upgrade.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 6ebfaf006b..3c7d641f05 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -185,7 +185,11 @@ module Homebrew end fi.prelude - oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{fi.options.to_a.join " "}" + if f.optlinked? + oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{Keg.new(f.opt_prefix).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 " "}" + end # 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 From 22375bae7caf3a670308752b75881a45a0de2aae Mon Sep 17 00:00:00 2001 From: Boris Klimenko <2@borisklimenko.ru> Date: Wed, 26 Feb 2020 13:49:12 +0300 Subject: [PATCH 2/4] Fix style --- Library/Homebrew/cmd/upgrade.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 3c7d641f05..e1e9b9e5e5 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -186,7 +186,8 @@ module Homebrew fi.prelude if f.optlinked? - oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{Keg.new(f.opt_prefix).version} -> #{f.pkg_version} #{fi.options.to_a.join " "}" + oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{Keg.new(f.opt_prefix).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 " "}" end 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 3/4] 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 From 00aa4b7a0bb5358dfc55107231b979407ba7140c Mon Sep 17 00:00:00 2001 From: Boris Klimenko <2@borisklimenko.ru> Date: Wed, 26 Feb 2020 16:49:48 +0300 Subject: [PATCH 4/4] Apply suggestions from code review Co-Authored-By: Bo Anderson --- Library/Homebrew/cmd/upgrade.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 205ddf7cd0..41f2923262 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -187,7 +187,6 @@ module Homebrew upgrade_version = if f.optlinked? "#{Keg.new(f.opt_prefix).version} -> #{f.pkg_version}" - " #{f.pkg_version} #{fi.options.to_a.join " "}" else "-> #{f.pkg_version}" end