Fix package_utils.rb bug (#14039)

This commit is contained in:
Ed Reel
2026-01-04 14:19:08 -06:00
committed by GitHub
parent 0e3e75acce
commit 8f6682ac76

View File

@@ -76,28 +76,29 @@ class PackageUtils
end
def self.get_clean_version(pkg_version)
new_version = pkg_version.dup
# Delete debian versions for packages like libdb.
pkg_version.gsub!(/-dfsg.*/, '')
new_version.gsub!(/-dfsg.*/, '')
# Delete -gcc14, futureproofed until gcc 100
pkg_version.gsub!(/-gcc\d{2}/, '')
new_version.gsub!(/-gcc\d{2}/, '')
# Trim kde- prefixes in qt5 packages so nothing else gets confused.
pkg_version.delete_prefix!('kde-')
new_version.delete_prefix!('kde-')
# Delete -py3.12, futureproofed until Python 4
pkg_version.gsub!(/-py3\.\d{2}/, '')
new_version.gsub!(/-py3\.\d{2}/, '')
# Delete -ruby4.x, futureproofed until Ruby 5 or Ruby 4.10
pkg_version.gsub!(/-ruby4\.\d{1}/, '')
new_version.gsub!(/-ruby4\.\d{1}/, '')
# Delete -perl 5.40, futureproofed until Perl 5.100
pkg_version.gsub!(/-perl5\.\d{2}/, '')
new_version.gsub!(/-perl5\.\d{2}/, '')
# Delete -llvm18, futureproofed until llvm 100
pkg_version.gsub!(/-llvm\d{2}/, '')
new_version.gsub!(/-llvm\d{2}/, '')
# Delete -glibc2.37, or whatever the system glibc is.
pkg_version.delete_suffix!("-glibc#{LIBC_VERSION}")
new_version.delete_suffix!("-glibc#{LIBC_VERSION}")
# Delete git version tags (1.2.4-qnd73k6), avoiding overmatching and hitting things that arent git hashtags.
pkg_version.gsub!(/-\w{7}$/, '')
new_version.gsub!(/-\w{7}$/, '')
# Delete -icu75.1, futureproofed until icu 100
pkg_version.gsub!(/-icu\d{2}\.\d/, '')
new_version.gsub!(/-icu\d{2}\.\d/, '')
return pkg_version
return new_version
end
# Remove our language-specific prefixes and any build splitting suffixes.