mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-02 03:51:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

dir: If metadata is syntactically invalid, say which file is the problem

Browse Source 
Similar to the previous commit, but for metadata.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
2023-02-08 18:34:34 +00:00
parent 3ede5382fa
commit be2de97e86
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/flatpak-dir.c
View File

@@ -2983,7 +2983,7 @@ flatpak_dir_load_deployed (FlatpakDir *self,
metakey = g_key_file_new ();
if (!g_key_file_load_from_data (metakey, metadata_contents, metadata_size, 0, error))
return NULL;
return glnx_prefix_error_null (error, "%s", flatpak_file_get_path_cached (metadata));
deploy = flatpak_deploy_new (deploy_dir, ref, metakey, self->repo);
@@ -3633,7 +3633,7 @@ upgrade_deploy_data (GBytes *deploy_data,
&metadata_contents, &metadata_size, NULL, error))
return NULL;
if (!g_key_file_load_from_data (keyfile, metadata_contents, metadata_size, 0, error))
return NULL;
return glnx_prefix_error_null (error, "%s", flatpak_file_get_path_cached (metadata_file));
add_metadata_to_deploy_data (&metadata_dict, keyfile);
/* Add fields from appdata to deploy, since appdata-content-rating wasn't