From 8db7e44ea7defe7ce556357f40071e1a264da8aa Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 8 May 2023 05:38:13 +0200 Subject: [PATCH] Always remove build from `short_version`. --- Library/Homebrew/bundle_version.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/bundle_version.rb b/Library/Homebrew/bundle_version.rb index b13cbf28ea..12396ef0cc 100644 --- a/Library/Homebrew/bundle_version.rb +++ b/Library/Homebrew/bundle_version.rb @@ -50,6 +50,9 @@ module Homebrew sig { params(short_version: T.nilable(String), version: T.nilable(String)).void } def initialize(short_version, version) + # Remove version from short version, if present. + short_version = short_version&.sub(/\s*\(#{Regexp.escape(version)}\)\Z/, "") if version + @short_version = short_version.presence @version = version.presence @@ -79,8 +82,6 @@ module Homebrew short_version = self.short_version version = self.version - short_version = short_version&.delete_suffix("(#{version})") if version - return [T.must(short_version)] if short_version == version if short_version && version