From a9560a5150d0c2952d54e716be4d509324862ae2 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Sun, 20 Nov 2022 13:46:27 -0700 Subject: [PATCH] fix overzealous filetype search --- iso/empanadas/empanadas/configs/el9-beta.yaml | 5 +++++ iso/empanadas/empanadas/configs/el9lh.yaml | 5 +++++ iso/empanadas/empanadas/util/shared.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml index 8d862c8..4a7da3e 100644 --- a/iso/empanadas/empanadas/configs/el9-beta.yaml +++ b/iso/empanadas/empanadas/configs/el9-beta.yaml @@ -92,8 +92,13 @@ Container: format: tar.xz variants: [Base, Minimal, UBI] + RPI: + format: raw.xz OCP: format: qcow2 + Vagrant: + format: box + variants: [Libvirt, Vbox, VMware] livemap: git_repo: 'https://git.resf.org/sig_core/kickstarts.git' branch: 'r9-beta' diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml index 33059c0..5810e3b 100644 --- a/iso/empanadas/empanadas/configs/el9lh.yaml +++ b/iso/empanadas/empanadas/configs/el9lh.yaml @@ -92,8 +92,13 @@ Container: format: tar.xz variants: [Base, Minimal, UBI] + RPI: + format: raw.xz OCP: format: qcow2 + Vagrant: + format: box + variants: [Libvirt, Vbox, VMware] livemap: git_repo: 'https://git.resf.org/sig_core/kickstarts.git' branch: 'r9lh' diff --git a/iso/empanadas/empanadas/util/shared.py b/iso/empanadas/empanadas/util/shared.py index 2717567..eb657ec 100644 --- a/iso/empanadas/empanadas/util/shared.py +++ b/iso/empanadas/empanadas/util/shared.py @@ -579,7 +579,7 @@ class Shared: while True: for y in objs: 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']) next_token = res.get("NextContinuationToken", None) if next_token: @@ -640,7 +640,7 @@ class Shared: resp = xmltodict.parse(bucket_data.content) 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']) for arch in arches: