admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Honor build options and bottles when upgrading

Browse Source 
Fixes Homebrew/homebrew#11552.
Closes Homebrew/homebrew#11777.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Nicolas Despres 2012-04-20 17:07:45 +02:00 committed by Jack Nagel
parent 32ea2e3ad0
commit c2fdcf1a34
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/cmd/upgrade.rb
View File

@ -54,6 +54,7 @@ module Homebrew extend self
installer = FormulaInstaller.new(f, tab) installer = FormulaInstaller.new(f, tab)
installer.show_header = false installer.show_header = false
installer.install_bottle = install_bottle?(f) and tab.used_options.empty?
oh1 "Upgrading #{f.name}" oh1 "Upgrading #{f.name}"

7
Library/Homebrew/formula_installer.rb
View File

@ -182,7 +182,12 @@ class FormulaInstaller
args = ARGV.clone args = ARGV.clone
unless args.include? '--fresh' unless args.include? '--fresh'
args.concat tab.used_options unless tab.nil? unless tab.nil?
args.concat tab.used_options
# FIXME: enforce the download of the non-bottled package
# in the spawned Ruby process.
args << '--build-from-source'
end
args.uniq! # Just in case some dupes were added args.uniq! # Just in case some dupes were added
end end