From cff0122fc4b93a7c14bdfd64962d8e0dc8cb51ab Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Wed, 15 Jun 2022 16:32:14 -0400 Subject: [PATCH] Remove unnecessary HOMEBREW_INSTALL_FROM_API checks --- Library/Homebrew/cmd/fetch.rb | 14 +++----------- Library/Homebrew/cmd/outdated.rb | 5 +---- Library/Homebrew/dependency.rb | 2 -- .../Homebrew/extend/os/linux/keg_relocate.rb | 11 ++--------- Library/Homebrew/formula.rb | 18 +++--------------- 5 files changed, 9 insertions(+), 41 deletions(-) diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb index daba7dbfef..4d68457bde 100644 --- a/Library/Homebrew/cmd/fetch.rb +++ b/Library/Homebrew/cmd/fetch.rb @@ -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 diff --git a/Library/Homebrew/cmd/outdated.rb b/Library/Homebrew/cmd/outdated.rb index 568bf925ae..933de05583 100644 --- a/Library/Homebrew/cmd/outdated.rb +++ b/Library/Homebrew/cmd/outdated.rb @@ -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 } diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb index 609d6fd84a..7ac088dc16 100644 --- a/Library/Homebrew/dependency.rb +++ b/Library/Homebrew/dependency.rb @@ -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 diff --git a/Library/Homebrew/extend/os/linux/keg_relocate.rb b/Library/Homebrew/extend/os/linux/keg_relocate.rb index b76f3cb15c..4fafbbd6fa 100644 --- a/Library/Homebrew/extend/os/linux/keg_relocate.rb +++ b/Library/Homebrew/extend/os/linux/keg_relocate.rb @@ -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 diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index e1d43818a3..ee2cae9dd0 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -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?