From 939da295e778e18c66d507968be79412f4d189f2 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sun, 2 Mar 2014 14:02:18 -0600
Subject: Stop mutating build options in upgrade

---
 Library/Homebrew/cmd/upgrade.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'Library/Homebrew/cmd/upgrade.rb')

diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index d222c5a98..644e61184 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -54,16 +54,10 @@ module Homebrew extend self
   end
 
   def upgrade_formula f
-    tab = Tab.for_formula(f)
-
-    # Inject options from a previous install into the formula's
-    # BuildOptions object. TODO clean this up.
-    f.build.args += tab.used_options
-
     outdated_keg = Keg.new(f.linked_keg.realpath) rescue nil
 
     installer = FormulaInstaller.new(f)
-    installer.options |= tab.used_options
+    installer.options |= Tab.for_formula(f).used_options
     installer.show_header = false
 
     oh1 "Upgrading #{f.name}"
-- 
cgit v1.2.3