From 41f2adaf46dc0ca5d8bf12ad5a6177f061b19925 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 14 Mar 2024 08:25:26 -0700
Subject: [PATCH] os_release: update for osbuild change to ISO names

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 tests/os_release.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/os_release.pm b/tests/os_release.pm
index 63816225..e82a75ab 100644
--- a/tests/os_release.pm
+++ b/tests/os_release.pm
@@ -50,6 +50,9 @@ sub run {
     my ($cannedver, $cannednum) = (split /-/, $isovar)[-2, -1];
     # Get rid of the ".iso" part of the tag.
     $cannednum =~ s/\.iso//g;
+    # also get rid of the arch, which osbuild puts in here
+    my $arch = get_var("ARCH");
+    $cannednum =~ s/\.$arch//g;
     # Now, we merge the fields into one expression to create the correct canned tag
     # that will contain both the version number and the build number.
     my $cannedtag = "$cannedver.$cannednum";