From b24228277d7f036e726c9d91f679c42f73ebf591 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 6 Feb 2017 11:59:03 +0100 Subject: [PATCH] Support appdata in share/metainfo also with rename-appdata-file --- builder/builder-manifest.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c index d5a730a7..229b914f 100644 --- a/builder/builder-manifest.c +++ b/builder/builder-manifest.c @@ -1683,6 +1683,7 @@ builder_manifest_cleanup (BuilderManifest *self, g_autoptr(GFile) appdata_dir = NULL; g_autofree char *appdata_basename = NULL; g_autoptr(GFile) appdata_file = NULL; + g_autoptr(GFile) appdata_source = NULL; int i; builder_manifest_checksum_for_cleanup (self, cache, context); @@ -1732,16 +1733,16 @@ builder_manifest_cleanup (BuilderManifest *self, } app_root = g_file_get_child (app_dir, "files"); - appdata_dir = g_file_resolve_relative_path (app_root, "share/appdata"); + appdata_basename = g_strdup_printf ("%s.appdata.xml", self->id); - appdata_file = g_file_get_child (appdata_dir, appdata_basename); - if (!g_file_query_exists (appdata_file, NULL)) + appdata_dir = g_file_resolve_relative_path (app_root, "share/appdata"); + appdata_source = g_file_get_child (appdata_dir, self->rename_appdata_file ? self->rename_appdata_file : appdata_basename); + if (!g_file_query_exists (appdata_source, NULL)) { g_object_unref (appdata_dir); - g_object_unref (appdata_file); appdata_dir = g_file_resolve_relative_path (app_root, "share/metainfo"); - appdata_file = g_file_get_child (appdata_dir, appdata_basename); } + appdata_file = g_file_get_child (appdata_dir, appdata_basename); if (self->rename_appdata_file != NULL) {