summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Gonzalez <rymg19@gmail.com>2019-06-10 19:38:52 +0000
committerAtomic Bot <atomic-devel@projectatomic.io>2019-09-19 12:43:18 +0000
commit2fdad8379992901bb15044ef2db41752414366a5 (patch)
tree1ae546d41850908f131d7c232d93c969a7a50cbd
parent18baeac0469bb6d68cb1dad3289efa3cd7862e4e (diff)
downloadflatpak-2fdad8379992901bb15044ef2db41752414366a5.tar.gz
dir: Use ExtensionOf.runtime for apply_extra
Closes: #2954 Approved by: alexlarsson (cherry picked from commit 9cd682b057206de8596bdba6303a0414207ef621) Closes: #2992 Approved by: alexlarsson (cherry picked from commit cdc8d2deb5567727c2adaa0f962cba75ab86ac1a) Closes: #3115 Approved by: alexlarsson (cherry picked from commit 4b7963f5b1c303d4a9d2e21afdfdf5338841b93c) Closes: #3117 Approved by: alexlarsson
-rw-r--r--common/flatpak-dir.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 7d44cfb4..1c1a48eb 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -6466,6 +6466,9 @@ apply_extra_data (FlatpakDir *self,
runtime = g_key_file_get_string (metakey, group,
FLATPAK_METADATA_KEY_RUNTIME, error);
if (runtime == NULL)
+ runtime = g_key_file_get_string (metakey, FLATPAK_METADATA_GROUP_EXTENSION_OF,
+ FLATPAK_METADATA_KEY_RUNTIME, NULL);
+ if (runtime == NULL)
return FALSE;
runtime_ref = g_build_filename ("runtime", runtime, NULL);