sshtepa/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Pull Requests Activity

fix filetype issues with images

Browse Source
This commit is contained in:
Louis Abel 2022-11-20 13:15:06 -07:00
parent 73d774e0e4
commit 9c1ea04fee
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
iso/empanadas/empanadas/configs/.el9.yaml.swp Normal file
View File

Binary file not shown.

10
iso/empanadas/empanadas/util/iso_utils.py
View File

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