From 1f483bfe71f042c586934af0ad14e80fb5bd25e7 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Sun, 26 Nov 2023 02:48:18 +0000 Subject: [PATCH 1/2] utils/analytics: don't fail on invalid version --- Library/Homebrew/utils/analytics.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb index 15ac575751..35c7f80a0d 100644 --- a/Library/Homebrew/utils/analytics.rb +++ b/Library/Homebrew/utils/analytics.rb @@ -313,8 +313,12 @@ options: options) sig { returns(T::Hash[Symbol, String]) } def default_fields_influx @default_fields_influx ||= begin - version = HOMEBREW_VERSION.match(/^[\d.]+/)[0] - version = "#{version}-dev" if HOMEBREW_VERSION.include?("-") + version = if (match_data = HOMEBREW_VERSION.match(/^[\d.]+/)) + suffix = "-dev" if HOMEBREW_VERSION.include?("-") + match_data[0] + suffix.to_s + else + ">=4.1.22" + end # Only include OS versions with an actual name. os_name_and_version = if (os_version = OS_VERSION.presence) && os_version.downcase.match?(/^[a-z]/) From e3d1996a438c2e9cf028c8e4668181aeac23b3b1 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 30 Nov 2023 11:44:10 +0000 Subject: [PATCH 2/2] brew.sh: bump unknown HOMEBREW_VERSION. --- Library/Homebrew/brew.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 0139b97590..a079f40e14 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -485,8 +485,8 @@ HOMEBREW_VERSION="$("${HOMEBREW_GIT}" -C "${HOMEBREW_REPOSITORY}" describe --tag HOMEBREW_USER_AGENT_VERSION="${HOMEBREW_VERSION}" if [[ -z "${HOMEBREW_VERSION}" ]] then - HOMEBREW_VERSION=">=2.5.0 (shallow or no git repository)" - HOMEBREW_USER_AGENT_VERSION="2.X.Y" + HOMEBREW_VERSION=">=4.1.0 (shallow or no git repository)" + HOMEBREW_USER_AGENT_VERSION="4.X.Y" fi HOMEBREW_CORE_REPOSITORY="${HOMEBREW_LIBRARY}/Taps/homebrew/homebrew-core"