Remove unnecessary HOMEBREW_INSTALL_FROM_API checks
This commit is contained in:
parent
1e536217b2
commit
cff0122fc4
@ -66,26 +66,18 @@ module Homebrew
|
||||
args = fetch_args.parse
|
||||
|
||||
bucket = if args.deps?
|
||||
args.named.to_formulae_and_casks(prefer_loading_from_api: true).flat_map do |formula_or_cask|
|
||||
args.named.to_formulae_and_casks.flat_map do |formula_or_cask|
|
||||
case formula_or_cask
|
||||
when Formula
|
||||
f = formula_or_cask
|
||||
|
||||
deps = if Homebrew::EnvConfig.install_from_api?
|
||||
f.recursive_dependencies do |_, dependency|
|
||||
Dependency.prune if EnvConfig.install_from_api? && (dependency.build? || dependency.test?)
|
||||
end
|
||||
else
|
||||
f.recursive_dependencies
|
||||
end
|
||||
|
||||
[f, *deps.map(&:to_formula)]
|
||||
[f, *f.recursive_dependencies.map(&:to_formula)]
|
||||
else
|
||||
formula_or_cask
|
||||
end
|
||||
end
|
||||
else
|
||||
args.named.to_formulae_and_casks(prefer_loading_from_api: true)
|
||||
args.named.to_formulae_and_casks
|
||||
end.uniq
|
||||
|
||||
puts "Fetching: #{bucket * ", "}" if bucket.size > 1
|
||||
|
||||
@ -98,10 +98,7 @@ module Homebrew
|
||||
if verbose?
|
||||
outdated_kegs = f.outdated_kegs(fetch_head: args.fetch_HEAD?)
|
||||
|
||||
current_version = if !f.head? && Homebrew::EnvConfig.install_from_api? &&
|
||||
(f.core_formula? || f.tap.blank?)
|
||||
Homebrew::API::Versions.latest_formula_version(f.name)&.to_s || f.pkg_version.to_s
|
||||
elsif f.alias_changed? && !f.latest_formula.latest_version_installed?
|
||||
current_version = if f.alias_changed? && !f.latest_formula.latest_version_installed?
|
||||
latest = f.latest_formula
|
||||
"#{latest.name} (#{latest.pkg_version})"
|
||||
elsif f.head? && outdated_kegs.any? { |k| k.version.to_s == f.pkg_version.to_s }
|
||||
|
||||
@ -103,8 +103,6 @@ class Dependency
|
||||
|
||||
deps.each do |dep|
|
||||
next if dependent.name == dep.name
|
||||
# avoid downloading build dependency bottles
|
||||
next if dep.build? && dependent.pour_bottle? && Homebrew::EnvConfig.install_from_api?
|
||||
|
||||
case action(dependent, dep, &block)
|
||||
when :prune
|
||||
|
||||
@ -84,16 +84,9 @@ class Keg
|
||||
def self.bottle_dependencies
|
||||
@bottle_dependencies ||= begin
|
||||
formulae = relocation_formulae
|
||||
if Homebrew::EnvConfig.install_from_api?
|
||||
gcc_hash = Homebrew::API::Formula.fetch(CompilerSelector.preferred_gcc)
|
||||
preferred_gcc_version = Version.new gcc_hash["versions"]["stable"]
|
||||
else
|
||||
gcc = Formulary.factory(CompilerSelector.preferred_gcc)
|
||||
preferred_gcc_version = gcc.version
|
||||
end
|
||||
gcc = Formulary.factory(CompilerSelector.preferred_gcc)
|
||||
if !Homebrew::EnvConfig.simulate_macos_on_linux? &&
|
||||
DevelopmentTools.non_apple_gcc_version("gcc") < preferred_gcc_version.major
|
||||
gcc = Formulary.factory(CompilerSelector.preferred_gcc) if Homebrew::EnvConfig.install_from_api?
|
||||
DevelopmentTools.non_apple_gcc_version("gcc") < gcc.version.to_i
|
||||
formulae += gcc.recursive_dependencies.map(&:name)
|
||||
formulae << gcc.name
|
||||
end
|
||||
|
||||
@ -525,14 +525,7 @@ class Formula
|
||||
# exists and is not empty.
|
||||
# @private
|
||||
def latest_version_installed?
|
||||
latest_prefix = if !head? && Homebrew::EnvConfig.install_from_api? &&
|
||||
(latest_pkg_version = Homebrew::API::Versions.latest_formula_version(name))
|
||||
prefix latest_pkg_version
|
||||
else
|
||||
latest_installed_prefix
|
||||
end
|
||||
|
||||
(dir = latest_prefix).directory? && !dir.children.empty?
|
||||
(dir = latest_installed_prefix).directory? && !dir.children.empty?
|
||||
end
|
||||
|
||||
# If at least one version of {Formula} is installed.
|
||||
@ -1352,11 +1345,6 @@ class Formula
|
||||
Formula.cache[:outdated_kegs][cache_key] ||= begin
|
||||
all_kegs = []
|
||||
current_version = T.let(false, T::Boolean)
|
||||
latest_version = if !head? && Homebrew::EnvConfig.install_from_api? && (core_formula? || tap.blank?)
|
||||
Homebrew::API::Versions.latest_formula_version(name) || pkg_version
|
||||
else
|
||||
pkg_version
|
||||
end
|
||||
|
||||
installed_kegs.each do |keg|
|
||||
all_kegs << keg
|
||||
@ -1364,8 +1352,8 @@ class Formula
|
||||
next if version.head?
|
||||
|
||||
tab = Tab.for_keg(keg)
|
||||
next if version_scheme > tab.version_scheme && latest_version != version
|
||||
next if version_scheme == tab.version_scheme && latest_version > version
|
||||
next if version_scheme > tab.version_scheme && pkg_version != version
|
||||
next if version_scheme == tab.version_scheme && pkg_version > version
|
||||
|
||||
# don't consider this keg current if there's a newer formula available
|
||||
next if follow_installed_alias? && new_formula_available?
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user