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

Merge pull request #10788 from MikeMcQuaid/check_install_sanity_bottle_tweaks

Browse Source 
formula_installer: tweak "no bottle available" logic.
This commit is contained in:
Mike McQuaid 2021-03-08 12:15:36 +00:00 committed by GitHub
commit 6e286d53c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formula_installer.rb
View File

@ -227,7 +227,7 @@ class FormulaInstaller
raise CannotInstallFormulaError, "--force-bottle passed but #{formula.full_name} has no bottle!" raise CannotInstallFormulaError, "--force-bottle passed but #{formula.full_name} has no bottle!"
end end
if Homebrew.default_prefix? && !Homebrew::EnvConfig.developer? && if Homebrew.default_prefix? &&
# TODO: re-enable this on Linux when we merge linuxbrew-core into # TODO: re-enable this on Linux when we merge linuxbrew-core into
# homebrew-core and have full bottle coverage. # homebrew-core and have full bottle coverage.
(OS.mac? || ENV["CI"]) && (OS.mac? || ENV["CI"]) &&
@ -246,7 +246,7 @@ class FormulaInstaller
# don't want to complain about no bottle available if doing an # don't want to complain about no bottle available if doing an
# upgrade/reinstall/dependency install (but do in the case the bottle # upgrade/reinstall/dependency install (but do in the case the bottle
# check fails) # check fails)
elsif !installed_as_dependency? && !formula.any_version_installed? elsif !Homebrew::EnvConfig.developer? && (!installed_as_dependency? || !formula.any_version_installed?)
<<~EOS <<~EOS
#{formula}: no bottle available! #{formula}: no bottle available!
EOS EOS
@ -701,6 +701,7 @@ class FormulaInstaller
quiet: quiet?, quiet: quiet?,
verbose: verbose?, verbose: verbose?,
) )
fi.prelude
fi.fetch fi.fetch
end end
@ -754,7 +755,6 @@ class FormulaInstaller
verbose: verbose?, verbose: verbose?,
}, },
) )
fi.prelude
oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}" oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}"
fi.install fi.install
fi.finish fi.finish