aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorJack Nagel2014-03-02 14:02:18 -0600
committerJack Nagel2014-03-02 14:02:18 -0600
commitde254f6cd64952029b4fbea17f5abde29eed40cd (patch)
tree2fab0df8fcee36a362ae4b9e35f9637dd6598b7c /Library/Homebrew/cmd
parent0eefded9832692198c7ddfb975cb355ed5ddc7c1 (diff)
downloadbrew-de254f6cd64952029b4fbea17f5abde29eed40cd.tar.bz2
Stop mutating build options in upgrade
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/upgrade.rb8
1 files changed, 1 insertions, 7 deletions
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}"