From 7b9556db0618e3b3752d74572a3c4108a36878fe Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 14 Dec 2020 09:26:30 +0100 Subject: [PATCH] Remove trailing `version` from `short_version`. --- Library/Homebrew/bundle_version.rb | 2 ++ Library/Homebrew/test/bundle_version_spec.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/Library/Homebrew/bundle_version.rb b/Library/Homebrew/bundle_version.rb index 8c9b07b48e..b13849ba1d 100644 --- a/Library/Homebrew/bundle_version.rb +++ b/Library/Homebrew/bundle_version.rb @@ -67,6 +67,8 @@ module Homebrew sig { returns(T::Array[String]) } def nice_parts + short_version = self.short_version&.delete_suffix("(#{version})") if version + return [short_version] if short_version == version if short_version && version diff --git a/Library/Homebrew/test/bundle_version_spec.rb b/Library/Homebrew/test/bundle_version_spec.rb index 4d653b98de..e750fd1974 100644 --- a/Library/Homebrew/test/bundle_version_spec.rb +++ b/Library/Homebrew/test/bundle_version_spec.rb @@ -17,6 +17,7 @@ describe Homebrew::BundleVersion do ["1.2.3.4000", "4000"] => "1.2.3.4000", ["5", "5.0.45"] => "5.0.45", ["XQuartz-2.7.11", "2.7.112"] => "2.7.11", + ["2.5.2(3329)", "3329"] => "2.5.2,3329", } expected_mappings.each do |(short_version, version), expected_version|