lumarel/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix overzealous filetype search

Browse Source
This commit is contained in:
Louis Abel 2022-11-20 13:46:27 -07:00
parent 3849c6fcdf
commit a9560a5150
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iso/empanadas/empanadas/configs/el9-beta.yaml
View File

@ -92,8 +92,13 @@
Container: Container:
format: tar.xz format: tar.xz
variants: [Base, Minimal, UBI] variants: [Base, Minimal, UBI]
RPI:
format: raw.xz
OCP: OCP:
format: qcow2 format: qcow2
Vagrant:
format: box
variants: [Libvirt, Vbox, VMware]
livemap: livemap:
git_repo: 'https://git.resf.org/sig_core/kickstarts.git' git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
branch: 'r9-beta' branch: 'r9-beta'

5
iso/empanadas/empanadas/configs/el9lh.yaml
View File

@ -92,8 +92,13 @@
Container: Container:
format: tar.xz format: tar.xz
variants: [Base, Minimal, UBI] variants: [Base, Minimal, UBI]
RPI:
format: raw.xz
OCP: OCP:
format: qcow2 format: qcow2
Vagrant:
format: box
variants: [Libvirt, Vbox, VMware]
livemap: livemap:
git_repo: 'https://git.resf.org/sig_core/kickstarts.git' git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
branch: 'r9lh' branch: 'r9lh'

4
iso/empanadas/empanadas/util/shared.py
View File

@ -579,7 +579,7 @@ class Shared:
while True: while True:
for y in objs: for y in objs:
key = y['Key'] key = y['Key']
if filetype in key and release in key and name in key: if key.endswith(filetype) and release in key and name in key:
temp.append(y['Key']) temp.append(y['Key'])
next_token = res.get("NextContinuationToken", None) next_token = res.get("NextContinuationToken", None)
if next_token: if next_token:
@ -640,7 +640,7 @@ class Shared:
resp = xmltodict.parse(bucket_data.content) resp = xmltodict.parse(bucket_data.content)
for y in resp['ListBucketResult']['Contents']: for y in resp['ListBucketResult']['Contents']:
if filetype in y['Key'] and release in y['Key'] and name in y['Key']: if y['Key'].endswith(filetype) and release in y['Key'] and name in y['Key']:
temp.append(y['Key']) temp.append(y['Key'])
for arch in arches: for arch in arches: