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

Merge pull request #6066 from MikeMcQuaid/upgrade-build-bottle-tweaks

Browse Source 
upgrade: don't build bottles unnecessarily.
This commit is contained in:
Mike McQuaid 2019-04-25 14:28:25 -07:00 committed by GitHub
commit 193173f470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,10 +164,11 @@ module Homebrew
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.options = options fi.options = options
fi.build_bottle = args.build_bottle? || (!f.bottle_defined? && f.build.bottle?) fi.build_bottle = args.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
if tab if tab
fi.build_bottle ||= tab.built_bottle?
fi.installed_as_dependency = tab.installed_as_dependency fi.installed_as_dependency = tab.installed_as_dependency
fi.installed_on_request ||= tab.installed_on_request fi.installed_on_request ||= tab.installed_on_request
end end

2
Library/Homebrew/tab.rb
View File

@ -280,7 +280,7 @@ class Tab < OpenStruct
CxxStdlib.create(lib, compiler.to_sym) CxxStdlib.create(lib, compiler.to_sym)
end end
def build_bottle? def built_bottle?
built_as_bottle && !poured_from_bottle built_as_bottle && !poured_from_bottle
end end