mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-04 22:17:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

dir: Also handle tagged extension names in find_remote_related and find_local_related

Browse Source 
Closes: #1531
Approved by: alexlarsson
This commit is contained in:
Sam Spilsbury
2018-03-30 20:49:26 +07:00
committed by Atomic Bot
parent bc5cfafb26
commit efa183e3d6
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/flatpak-dir.c
View File

@@ -10585,11 +10585,12 @@ flatpak_dir_find_remote_related (FlatpakDir *self,
groups = g_key_file_get_groups (metakey, NULL);
for (i = 0; groups[i] != NULL; i++)
{
char *extension;
char *tagged_extension;
if (g_str_has_prefix (groups[i], FLATPAK_METADATA_GROUP_PREFIX_EXTENSION) &&
*(extension = (groups[i] + strlen (FLATPAK_METADATA_GROUP_PREFIX_EXTENSION))) != 0)
*(tagged_extension = (groups[i] + strlen (FLATPAK_METADATA_GROUP_PREFIX_EXTENSION))) != 0)
{
g_autofree char *extension = NULL;
g_autofree char *version = g_key_file_get_string (metakey, groups[i],
FLATPAK_METADATA_KEY_VERSION, NULL);
gboolean subdirectories = g_key_file_get_boolean (metakey, groups[i],
@@ -10607,6 +10608,9 @@ flatpak_dir_find_remote_related (FlatpakDir *self,
g_autofree char *extension_ref = NULL;
g_autofree char *checksum = NULL;
/* Parse actual extension name */
flatpak_parse_extension_with_tag (tagged_extension, &extension, NULL);
if (version)
branch = version;
else
@@ -10749,11 +10753,12 @@ flatpak_dir_find_local_related (FlatpakDir *self,
groups = g_key_file_get_groups (metakey, NULL);
for (i = 0; groups[i] != NULL; i++)
{
char *extension;
char *tagged_extension;
if (g_str_has_prefix (groups[i], FLATPAK_METADATA_GROUP_PREFIX_EXTENSION) &&
*(extension = (groups[i] + strlen (FLATPAK_METADATA_GROUP_PREFIX_EXTENSION))) != 0)
*(tagged_extension = (groups[i] + strlen (FLATPAK_METADATA_GROUP_PREFIX_EXTENSION))) != 0)
{
g_autofree char *extension = NULL;
g_autofree char *version = g_key_file_get_string (metakey, groups[i],
FLATPAK_METADATA_KEY_VERSION, NULL);
gboolean subdirectories = g_key_file_get_boolean (metakey, groups[i],
@@ -10772,6 +10777,9 @@ flatpak_dir_find_local_related (FlatpakDir *self,
g_autofree char *checksum = NULL;
g_autofree char *extension_collection_id = NULL;
/* Parse actual extension name */
flatpak_parse_extension_with_tag (tagged_extension, &extension, NULL);
if (version)
branch = version;
else