From 0fdec95fe068cd497b1c5a5b60d21103c711d2a4 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 11 Jun 2020 15:43:16 +0200 Subject: [PATCH] OCI: Also look for the docker media type when looking manifests We handle both types, so look for both. --- common/flatpak-json-oci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/flatpak-json-oci.c b/common/flatpak-json-oci.c index 840f0cd4..3b683d6d 100644 --- a/common/flatpak-json-oci.c +++ b/common/flatpak-json-oci.c @@ -502,7 +502,8 @@ const char * flatpak_oci_manifest_descriptor_get_ref (FlatpakOciManifestDescriptor *m) { if (m->parent.mediatype == NULL || - strcmp (m->parent.mediatype, FLATPAK_OCI_MEDIA_TYPE_IMAGE_MANIFEST) != 0) + (strcmp (m->parent.mediatype, FLATPAK_OCI_MEDIA_TYPE_IMAGE_MANIFEST) != 0 && + strcmp (m->parent.mediatype, FLATPAK_DOCKER_MEDIA_TYPE_IMAGE_MANIFEST2) != 0)) return NULL; if (m->parent.annotations == NULL)