From df97acb0871d178dd31c86ef73bd3d3dd7e88b39 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Aug 24 2024 20:31:27 +0000
Subject: Apply correct kiwibuild bundle name format settings everywhere


The cloud and container config files need updated settings, and
the main configuration file needs special settings for container
images.

Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>

---

diff --git a/fedora-cloud.conf b/fedora-cloud.conf
index c7538db..c25a177 100644
--- a/fedora-cloud.conf
+++ b/fedora-cloud.conf
@@ -144,7 +144,9 @@ global_target = 'f42'
 # kiwi image global configuration
 kiwibuild_description_scm = 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD'
 kiwibuild_description_path = 'Fedora.kiwi'
-kiwibuild_bundle_name_format = '%N-%P-%(global_version)s-%I.%A.%T'
+# global_version is substituted by kobo as part of reading of this
+# config file, the other specifiers are passed through to kiwi
+kiwibuild_bundle_name_format = '%%N-%s-%%I.%%A' % global_version
 
 # kiwi images need another target that uses old mock chroot
 kiwibuild_target = 'f42-kiwi'
diff --git a/fedora-container.conf b/fedora-container.conf
index 531b3bc..8c6188a 100644
--- a/fedora-container.conf
+++ b/fedora-container.conf
@@ -142,7 +142,9 @@ global_target = 'f42'
 # kiwi image global configuration
 kiwibuild_description_scm = 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD'
 kiwibuild_description_path = 'Fedora.kiwi'
-kiwibuild_bundle_name_format = '%N-%P-%(global_version)s-%I.%A.%T'
+# global_version is substituted by kobo as part of reading of this
+# config file, the other specifiers are passed through to kiwi
+kiwibuild_bundle_name_format = '%%N-%s-%%I.%%A.%%T' % global_version
 
 
 kiwibuild = {
diff --git a/fedora.conf b/fedora.conf
index e4fec5c..78a6922 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -429,6 +429,7 @@ kiwibuild = {
             'repos': ['Everything'],
             'subvariant': 'Container_Base',
             'target': global_target,
+            'bundle_name_format': '%%N-%s-%%I.%%A.%%T' % global_version,
             'failable': ['*'],
         },
         {
@@ -437,6 +438,7 @@ kiwibuild = {
             'repos': ['Everything'],
             'subvariant': 'Container_Minimal_Base',
             'target': global_target,
+            'bundle_name_format': '%%N-%s-%%I.%%A.%%T' % global_version,
             'failable': ['*'],
         },
         {
@@ -445,6 +447,7 @@ kiwibuild = {
             'repos': ['Everything'],
             'subvariant': 'Container_Toolbox',
             'target': global_target,
+            'bundle_name_format': '%%N-%s-%%I.%%A.%%T' % global_version,
             'failable': [''],
         }
         ],