From 9c1ea04fee903290f9c0a0d8f9aa0e921ebb610f Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sun, 20 Nov 2022 13:15:06 -0700
Subject: [PATCH] fix filetype issues with images

---
 iso/empanadas/empanadas/configs/.el9.yaml.swp | Bin 0 -> 16384 bytes
 iso/empanadas/empanadas/util/iso_utils.py     |  10 ++++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 iso/empanadas/empanadas/configs/.el9.yaml.swp

diff --git a/iso/empanadas/empanadas/configs/.el9.yaml.swp b/iso/empanadas/empanadas/configs/.el9.yaml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..6d6b013878048d60ed591366857032dca13b5eb1
GIT binary patch
literal 16384
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
GBmV)KvFOSG

literal 0
HcmV?d00001

diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index 22501b4..bd9902d 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -1372,6 +1372,7 @@ class IsoBuild:
             latest_artifacts[name] = {}
             primary_variant = extra['primary_variant'] if 'primary_variant' in extra else None
             latest_artifacts[name]['primary'] = primary_variant
+            latest_artifacts[name]['formattype'] = formattype
 
             variants = extra['variants'] if 'variants' in extra.keys() else [None] # need to loop once
             imagename = name
@@ -1413,6 +1414,7 @@ class IsoBuild:
         #print(latest_artifacts)
         for keyname in latest_artifacts.keys():
             primary = latest_artifacts[keyname]['primary']
+            filetype = latest_artifacts[keyname]['formattype']
             for imgname in latest_artifacts[keyname]:
                 keysect = latest_artifacts[keyname][imgname]
                 if imgname == 'primary':
@@ -1491,7 +1493,7 @@ class IsoBuild:
                             self.major_version,
                             imgname,
                             arch,
-                            formattype
+                            filetype
                     )
                     latest_path = latest_name.split('/')[-1]
                     latest_checksum = '{}/{}-{}-{}.latest.{}.{}.CHECKSUM'.format(
@@ -1500,7 +1502,7 @@ class IsoBuild:
                             self.major_version,
                             imgname,
                             arch,
-                            formattype
+                            filetype
                     )
                     # For some reason python doesn't have a "yeah just change this
                     # link" part of the function
@@ -1530,7 +1532,7 @@ class IsoBuild:
                                 self.major_version,
                                 keyname,
                                 arch,
-                                formattype
+                                filetype
                         )
                         latest_primary_checksum = '{}/{}-{}-{}.latest.{}.{}.CHECKSUM'.format(
                                 image_arch_dir,
@@ -1538,7 +1540,7 @@ class IsoBuild:
                                 self.major_version,
                                 keyname,
                                 arch,
-                                formattype
+                                filetype
                         )
                         latest_primary_path = latest_primary_name.split('/')[-1]