From f2139c61ed2d0c36e35f9310ab945f5e21b38006 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 25 Mar 2025 15:39:50 +0000 Subject: [PATCH 1/2] bundle/brew_installer: strip revision number from version file. This doesn't make sense for consumption outside of Homebrew. --- Library/Homebrew/bundle/brew_installer.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/bundle/brew_installer.rb b/Library/Homebrew/bundle/brew_installer.rb index cf5112e53b..6efabb3267 100644 --- a/Library/Homebrew/bundle/brew_installer.rb +++ b/Library/Homebrew/bundle/brew_installer.rb @@ -61,11 +61,12 @@ module Homebrew if result && @version_file.present? # Use the version from the environment if it hasn't changed. + # Strip the revision number because it's not part of the non-Homebrew version. version = if !changed? && (env_version = Bundle.formula_versions_from_env[@name]) env_version else Formula[@full_name].version.to_s - end + end.sub(/_\d+$/, "") version_path = Pathname.new(@version_file) version_path.write("#{version}\n") From e97a226b622641d29fc46c3f16cb5b52d3908eb8 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 25 Mar 2025 17:46:41 +0000 Subject: [PATCH 2/2] bundle/brew_installer: tweak approach. Co-authored-by: Bo Anderson --- Library/Homebrew/bundle/brew_installer.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/bundle/brew_installer.rb b/Library/Homebrew/bundle/brew_installer.rb index 6efabb3267..579d98e4ba 100644 --- a/Library/Homebrew/bundle/brew_installer.rb +++ b/Library/Homebrew/bundle/brew_installer.rb @@ -63,10 +63,10 @@ module Homebrew # Use the version from the environment if it hasn't changed. # Strip the revision number because it's not part of the non-Homebrew version. version = if !changed? && (env_version = Bundle.formula_versions_from_env[@name]) - env_version + PkgVersion.parse(env_version).version else - Formula[@full_name].version.to_s - end.sub(/_\d+$/, "") + Formula[@full_name].version + end.to_s version_path = Pathname.new(@version_file) version_path.write("#{version}\n")