From ef2ac98c5b8792e85b02649073e6a369a9353f8b Mon Sep 17 00:00:00 2001 From: Tobias Wolf Date: Wed, 23 Jul 2025 16:24:13 +0200 Subject: [PATCH] This commit fixes an issue with media-type lookups in sub-directories Signed-off-by: Tobias Wolf --- .github/actions/features_parse/action.yml | 2 +- .github/actions/flavors_parse/action.yml | 2 +- .github/actions/setup/action.yml | 2 +- pyproject.toml | 2 +- src/gardenlinux/constants.py | 4 ++-- src/gardenlinux/oci/layer.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/features_parse/action.yml b/.github/actions/features_parse/action.yml index 93ab20c3..f7e22f8a 100644 --- a/.github/actions/features_parse/action.yml +++ b/.github/actions/features_parse/action.yml @@ -11,7 +11,7 @@ outputs: runs: using: composite steps: - - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.5 + - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.6 - id: result shell: bash run: | diff --git a/.github/actions/flavors_parse/action.yml b/.github/actions/flavors_parse/action.yml index 64281cf4..12cce6ae 100644 --- a/.github/actions/flavors_parse/action.yml +++ b/.github/actions/flavors_parse/action.yml @@ -13,7 +13,7 @@ outputs: runs: using: composite steps: - - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.5 + - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.6 - id: matrix shell: bash run: | diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 71c7fee0..3cf5652f 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -3,7 +3,7 @@ description: Installs the given GardenLinux Python library inputs: version: description: GardenLinux Python library version - default: "0.8.5" + default: "0.8.6" runs: using: composite steps: diff --git a/pyproject.toml b/pyproject.toml index 9b4dcf62..fc512455 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gardenlinux" -version = "0.8.5" +version = "0.8.6" description = "Contains tools to work with the features directory of gardenlinux, for example deducting dependencies from feature sets or validating cnames" authors = ["Garden Linux Maintainers "] license = "Apache-2.0" diff --git a/src/gardenlinux/constants.py b/src/gardenlinux/constants.py index 1fc515e2..eb015922 100644 --- a/src/gardenlinux/constants.py +++ b/src/gardenlinux/constants.py @@ -85,7 +85,6 @@ "pxe.tar.gz", "qcow2.log", "test-log", - "boot.efi", "squashfs", "manifest", "vmdk.log", @@ -106,6 +105,7 @@ "vhd", "vmdk", "ova", + "efi", "uki", "raw", ] @@ -122,6 +122,7 @@ "gcpimage.tar.gz": "application/io.gardenlinux.image.format.gcpimage.tar.gz", "vmdk": "application/io.gardenlinux.image.format.vmdk", "ova": "application/io.gardenlinux.image.format.ova", + "efi": "application/io.gardenlinux.efi", "uki": "application/io.gardenlinux.uki", "uki.log": "application/io.gardenlinux.log", "raw": "application/io.gardenlinux.image.archive.format.raw", @@ -145,7 +146,6 @@ "root.squashfs": "application/io.gardenlinux.squashfs", "squashfs": "application/io.gardenlinux.squashfs", "squashfs.log": "application/io.gardenlinux.log", - "boot.efi": "application/io.gardenlinux.efi", "platform.test.log": "application/io.gardenlinux.io.platform.test.log", "platform.test.xml": "application/io.gardenlinux.io.platform.test.xml", "chroot.test.log": "application/io.gardenlinux.io.chroot.test.log", diff --git a/src/gardenlinux/oci/layer.py b/src/gardenlinux/oci/layer.py index 4c31316f..be6231a1 100644 --- a/src/gardenlinux/oci/layer.py +++ b/src/gardenlinux/oci/layer.py @@ -171,7 +171,7 @@ def lookup_media_type_for_file_name(file_name: str) -> str: file_name = Path(file_name) for lookup_name in GL_MEDIA_TYPES: - if file_name.match(f"*.{lookup_name}") or str(file_name) == lookup_name: + if file_name.match(f"*.{lookup_name}") or file_name.name == lookup_name: return GL_MEDIA_TYPE_LOOKUP[lookup_name] raise ValueError(