From 26182fd67aa3c6fbe789fbd0c6ecb047cf386f46 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 3 Mar 2023 08:51:58 +0000 Subject: [PATCH] Note that `brew update` will only report all without API. It's not worth supporting this option any longer given the API constraints. --- Library/Homebrew/cmd/update-report.rb | 7 ++++++- Library/Homebrew/env_config.rb | 5 ----- Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi | 2 -- docs/Manpage.md | 3 --- manpages/brew.1 | 6 ------ 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 22306001bf..0527f0dcad 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -629,7 +629,12 @@ class ReporterHub delegate empty?: :@hash def dump(updated_formula_report: true) - report_all = Homebrew::EnvConfig.update_report_all_formulae? + report_all = ENV["HOMEBREW_UPDATE_REPORT_ALL_FORMULAE"].present? + if report_all && !Homebrew::EnvConfig.no_install_from_api? + odeprecated "HOMEBREW_UPDATE_REPORT_ALL_FORMULAE" + opoo "This will not report all formulae because Homebrew cannot get this data from the API." + report_all = false + end dump_new_formula_report dump_new_cask_report diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index 6301e54483..11c0198973 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -378,11 +378,6 @@ module Homebrew default_text: "macOS: `/private/tmp`, Linux: `/tmp`.", default: HOMEBREW_DEFAULT_TEMP, }, - HOMEBREW_UPDATE_REPORT_ALL_FORMULAE: { - description: "If set, `brew update` lists changes to all formulae and cask files rather than only showing " \ - "when they are new and not installed or outdated and installed.", - boolean: true, - }, HOMEBREW_UPDATE_TO_TAG: { description: "If set, always use the latest stable tag (even if developer commands " \ "have been run).", diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index 4116351acb..7326aae376 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -4415,8 +4415,6 @@ module Homebrew::EnvConfig def self.temp(); end - def self.update_report_all_formulae?(); end - def self.update_to_tag?(); end def self.verbose?(); end diff --git a/docs/Manpage.md b/docs/Manpage.md index 21cbdc7686..4e3e6098bc 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -2268,9 +2268,6 @@ example, run `export HOMEBREW_NO_INSECURE_REDIRECT=1` rather than just *Default:* macOS: `/private/tmp`, Linux: `/tmp`. -- `HOMEBREW_UPDATE_REPORT_ALL_FORMULAE` -
If set, `brew update` lists changes to all formulae and cask files rather than only showing when they are new and not installed or outdated and installed. - - `HOMEBREW_UPDATE_TO_TAG`
If set, always use the latest stable tag (even if developer commands have been run). diff --git a/manpages/brew.1 b/manpages/brew.1 index 16dc246792..8c01c0d0a1 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -3357,12 +3357,6 @@ Use this path as the temporary directory for building packages\. Changing this m \fIDefault:\fR macOS: \fB/private/tmp\fR, Linux: \fB/tmp\fR\. . .TP -\fBHOMEBREW_UPDATE_REPORT_ALL_FORMULAE\fR -. -.br -If set, \fBbrew update\fR lists changes to all formulae and cask files rather than only showing when they are new and not installed or outdated and installed\. -. -.TP \fBHOMEBREW_UPDATE_TO_TAG\fR . .br