From 03749f705c6f654e0bae00b6952e485f0236c028 Mon Sep 17 00:00:00 2001 From: Carl George Date: Fri, 8 Nov 2024 01:56:24 -0600 Subject: [PATCH] bodhi/backend: use major version to construct EPEL latest link The latest epel-release symlink name is constructed by parsing the fifth digit out of the release. That was never going to work when we reached a double digit major version. It is resulting in a symlink of epel-release-latest-1.noarch.rpm for epel10.0. Instead, let's switch it to use the version value (without the minor version) from the release. Signed-off-by: Carl George --- roles/bodhi2/backend/files/new-updates-sync | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 78a8ae7519..cd5398eab5 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -482,14 +482,15 @@ def update_epel_release_latest(releases): """ for release in releases: if 'epel' in release: + major = RELEASES[release]['version'].split('.')[0] if 'next' in RELEASES[release]['repos']['epel']['to'][0]['dest']: - dest = '/pub/epel/epel-next-release-latest-' + release[4] + '.noarch.rpm' + dest = '/pub/epel/epel-next-release-latest-' + major + '.noarch.rpm' # For next's epel release, use the subpackage rpm from epel repo instead of # epel next repo release = release[:-1] path, pkg_relpath = get_epel_release_rel_path(release, True) else: - dest = '/pub/epel/epel-release-latest-' + release[4] + '.noarch.rpm' + dest = '/pub/epel/epel-release-latest-' + major + '.noarch.rpm' path, pkg_relpath = get_epel_release_rel_path(release) if os.path.lexists(dest) and os.path.islink(dest):