From e347f7ade38cc1695fc08e4f321751e800039929 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sat, 10 Dec 2016 13:07:03 +0000
Subject: reinstall/upgrade/install: always output options.

This is both easier for debugging and to communicate with users what is
being done.
---
 Library/Homebrew/cmd/reinstall.rb | 15 +++++++--------
 Library/Homebrew/cmd/upgrade.rb   |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'Library/Homebrew/cmd')

diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index 598286562..2eb2840a5 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -20,19 +20,15 @@ module Homebrew
   end
 
   def reinstall_formula(f)
-    options = BuildOptions.new(Options.create(ARGV.flags_only), f.options).used_options
-    options |= f.build.used_options
-    options &= f.options
-
-    notice  = "Reinstalling #{f.full_name}"
-    notice += " with #{options * ", "}" unless options.empty?
-    oh1 notice
-
     if f.opt_prefix.directory?
       keg = Keg.new(f.opt_prefix.resolved_path)
       backup keg
     end
 
+    options = BuildOptions.new(Options.create(ARGV.flags_only), f.options).used_options
+    options |= f.build.used_options
+    options &= f.options
+
     fi = FormulaInstaller.new(f)
     fi.options             = options
     fi.build_bottle        = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?)
@@ -43,6 +39,9 @@ module Homebrew
     fi.verbose             = ARGV.verbose?
     fi.debug               = ARGV.debug?
     fi.prelude
+
+    oh1 "Reinstalling #{f.full_name} #{options.to_a.join " "}"
+
     fi.install
     fi.finish
   rescue FormulaInstallationAlreadyAttemptedError
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index f92832aa2..5b49a9f65 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -104,7 +104,7 @@ module Homebrew
     fi.debug               = ARGV.debug?
     fi.prelude
 
-    oh1 "Upgrading #{f.full_specified_name}"
+    oh1 "Upgrading #{f.full_specified_name} #{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
-- 
cgit v1.2.3