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

formula_installer: exclude more from build-from-source warning.

Browse Source 
We should only complain when installing requested formulae that aren't
currently installed.
This commit is contained in:
Mike McQuaid 2020-12-18 14:55:59 +00:00
parent 603a0599cb
commit 2777369da7
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula_installer.rb
View File

@ -234,7 +234,8 @@ class FormulaInstaller
if Homebrew.default_prefix? && !Homebrew::EnvConfig.developer? && if Homebrew.default_prefix? && !Homebrew::EnvConfig.developer? &&
!build_from_source? && !build_bottle? && !build_from_source? && !build_bottle? &&
formula.tap&.core_tap? && !formula.bottle_unneeded? && !installed_as_dependency? &&
formula.tap&.core_tap? && !formula.bottle_unneeded? && !formula.any_version_installed? &&
# Integration tests override homebrew-core locations # Integration tests override homebrew-core locations
ENV["HOMEBREW_TEST_TMPDIR"].nil? && ENV["HOMEBREW_TEST_TMPDIR"].nil? &&
!pour_bottle? !pour_bottle?
@ -684,6 +685,7 @@ class FormulaInstaller
# been done for us in `compute_dependencies` and there's no requirement to # been done for us in `compute_dependencies` and there's no requirement to
# fetch in a particular order. # fetch in a particular order.
ignore_deps: true, ignore_deps: true,
installed_as_dependency: true,
include_test_formulae: @include_test_formulae, include_test_formulae: @include_test_formulae,
build_from_source_formulae: @build_from_source_formulae, build_from_source_formulae: @build_from_source_formulae,
keep_tmp: keep_tmp?, keep_tmp: keep_tmp?,