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

upgrade.rb: Generate Tab from Keg not Formula

Browse Source 
Two issues were preventing `brew upgrade` from functioning properly:

  - `Tab.for_formula` was used to recover options from prior installs. The
    problem is that during an upgrade `for_formula` will be directed to a
    non-existant install of the newer version and thus returns a forged tab
    claiming no options were invoked.

  - The assignment to `installer.install_bottle` requires parenthesis in order
    to function properly.
This commit is contained in:
Charlie Sharpsteen 2012-12-18 14:59:12 -08:00
parent 3dcce70a6a
commit 93dca5fb38
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,12 +53,15 @@ module Homebrew extend self
end
def upgrade_formula f
tab = Tab.for_formula(f)
# Generate using `for_keg` since the formula object points to a newer version
# that doesn't exist yet. Use `opt_prefix` to guard against keg-only installs.
# Also, guard against old installs that may not have an `opt_prefix` symlink.
tab = (f.opt_prefix.exist? ? Tab.for_keg(f.opt_prefix) : Tab.dummy_tab(f))
outdated_keg = Keg.new(f.linked_keg.realpath) rescue nil
installer = FormulaInstaller.new(f, tab)
installer.show_header = false
installer.install_bottle = install_bottle?(f) and tab.used_options.empty?
installer.install_bottle = (install_bottle?(f) and tab.used_options.empty?)
oh1 "Upgrading #{f.name}"