diff options
| author | Nicolas Despres | 2012-04-20 17:07:45 +0200 |
|---|---|---|
| committer | Jack Nagel | 2012-05-05 12:24:56 -0500 |
| commit | c2fdcf1a3490106fbe9e7a1d03375b2a75304f0a (patch) | |
| tree | 98a218d2cf7aec6bf0858e8889cef10af565de42 | |
| parent | 32ea2e3ad0b8cc3b159a154983e7a5f0f8728a46 (diff) | |
| download | brew-c2fdcf1a3490106fbe9e7a1d03375b2a75304f0a.tar.bz2 | |
Honor build options and bottles when upgrading
Fixes Homebrew/homebrew#11552.
Closes Homebrew/homebrew#11777.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index d9c130972..566649ed3 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -54,6 +54,7 @@ module Homebrew extend self installer = FormulaInstaller.new(f, tab) installer.show_header = false + installer.install_bottle = install_bottle?(f) and tab.used_options.empty? oh1 "Upgrading #{f.name}" diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 3f48e2dd6..db893e2ad 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -182,7 +182,12 @@ class FormulaInstaller args = ARGV.clone 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 end |