admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #15378 from reitermarkus/short-version-remove-build

Browse Source 
Always remove build from `short_version`.
This commit is contained in:
Mike McQuaid 2023-05-08 12:47:18 +01:00 committed by GitHub
commit b942294cf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/bundle_version.rb
View File

@ -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