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

Rename whole build_options block (copypaste from reinstall)

Browse Source
This commit is contained in:
L. E. Segovia 2017-12-02 20:04:03 +00:00
parent da764c6d6c
commit 9603e39f16
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,12 +119,13 @@ module Homebrew
tab = Tab.for_keg(keg) tab = Tab.for_keg(keg)
end end
new_build_options = BuildOptions.new(Options.create(ARGV.flags_only), f.options) build_options = BuildOptions.new(Options.create(ARGV.flags_only), f.options)
options = build_options.used_options
options |= f.build.used_options
options &= f.options
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.options = new_build_options.used_options fi.options = options
fi.options |= f.build.used_options
fi.options &= f.options
fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?) fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?)
fi.installed_on_request = !ARGV.named.empty? fi.installed_on_request = !ARGV.named.empty?
fi.link_keg = keg_was_linked if keg_had_linked_opt fi.link_keg = keg_was_linked if keg_had_linked_opt