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

Merge pull request #18100 from Homebrew/more-no-include-kernel

Browse Source
This commit is contained in:
Mike McQuaid 2024-08-20 16:35:15 +01:00 committed by GitHub
commit 972894d8a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Library/Homebrew/upgrade.rb
View File

@ -11,9 +11,7 @@ require "utils/topological_hash"
module Homebrew module Homebrew
# Helper functions for upgrading formulae. # Helper functions for upgrading formulae.
module Upgrade module Upgrade
module_function def self.upgrade_formulae(
def upgrade_formulae(
formulae_to_install, formulae_to_install,
flags:, flags:,
dry_run: false, dry_run: false,
@ -97,13 +95,13 @@ module Homebrew
end end
end end
def outdated_kegs(formula) private_class_method def self.outdated_kegs(formula)
[formula, *formula.old_installed_formulae].map(&:linked_keg) [formula, *formula.old_installed_formulae].map(&:linked_keg)
.select(&:directory?) .select(&:directory?)
.map { |k| Keg.new(k.resolved_path) } .map { |k| Keg.new(k.resolved_path) }
end end
def print_upgrade_message(formula, fi_options) private_class_method def self.print_upgrade_message(formula, fi_options)
version_upgrade = if formula.optlinked? version_upgrade = if formula.optlinked?
"#{Keg.new(formula.opt_prefix).version} -> #{formula.pkg_version}" "#{Keg.new(formula.opt_prefix).version} -> #{formula.pkg_version}"
else else
@ -113,7 +111,7 @@ module Homebrew
puts " #{version_upgrade} #{fi_options.to_a.join(" ")}" puts " #{version_upgrade} #{fi_options.to_a.join(" ")}"
end end
def create_formula_installer( private_class_method def self.create_formula_installer(
formula, formula,
flags:, flags:,
installed_on_request: false, installed_on_request: false,
@ -165,9 +163,8 @@ module Homebrew
}.compact, }.compact,
) )
end end
private_class_method :create_formula_installer
def upgrade_formula(formula_installer, dry_run: false, verbose: false) def self.upgrade_formula(formula_installer, dry_run: false, verbose: false)
formula = formula_installer.formula formula = formula_installer.formula
if dry_run if dry_run
@ -188,9 +185,8 @@ module Homebrew
puts puts
Homebrew.failed = true Homebrew.failed = true
end end
private_class_method :upgrade_formula
def install_formula(formula_installer, upgrade:) def self.install_formula(formula_installer, upgrade:)
formula = formula_installer.formula formula = formula_installer.formula
formula_installer.check_installation_already_attempted formula_installer.check_installation_already_attempted
@ -224,7 +220,7 @@ module Homebrew
end end
end end
def check_broken_dependents(installed_formulae) private_class_method def self.check_broken_dependents(installed_formulae)
CacheStoreDatabase.use(:linkage) do |db| CacheStoreDatabase.use(:linkage) do |db|
installed_formulae.flat_map(&:runtime_installed_formula_dependents) installed_formulae.flat_map(&:runtime_installed_formula_dependents)
.uniq .uniq
@ -249,7 +245,7 @@ module Homebrew
@puts_no_installed_dependents_check_disable_message_if_not_already = true @puts_no_installed_dependents_check_disable_message_if_not_already = true
end end
def check_installed_dependents( def self.check_installed_dependents(
formulae, formulae,
flags:, flags:,
dry_run: false, dry_run: false,
@ -435,7 +431,7 @@ module Homebrew
end end
end end
def depends_on(one, two) private_class_method def self.depends_on(one, two)
if one.any_installed_keg if one.any_installed_keg
&.runtime_dependencies &.runtime_dependencies
&.any? { |dependency| dependency["full_name"] == two.full_name } &.any? { |dependency| dependency["full_name"] == two.full_name }
@ -444,6 +440,5 @@ module Homebrew
one <=> two one <=> two
end end
end end
private_class_method :depends_on
end end
end end

5
Library/Homebrew/upgrade.rbi
View File

@ -1,5 +0,0 @@
# typed: strict
module Homebrew::Upgrade
include Kernel
end