mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-03 06:47:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle 'versions' key when finding local related ref

Browse Source 
We were only handling the old single-value 'version' key, even though
we handled the 'versions' key when finding remote related refs.

The result of this was that some extensions, such as the 19.08 opengl
default one was installed by default (as it was found as remote related)
yet still removed with --unused (as it was not locally related).

Fixes https://github.com/flatpak/flatpak/issues/3004

Closes: #3093
Approved by: mwleed

(manually cherry-picked from commit e4b1d16b7d)
This commit is contained in:
Alexander Larsson
2019-09-18 10:28:10 +02:00
committed by Alexander Larsson
parent 7844735dcf
commit aa7b62a0bf
1 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
common/flatpak-dir.c
View File

@@ -13757,6 +13757,9 @@ flatpak_dir_find_local_related_for_metadata (FlatpakDir *self,
g_autofree char *extension = NULL;
g_autofree char *version = g_key_file_get_string (metakey, groups[i],
FLATPAK_METADATA_KEY_VERSION, NULL);
g_auto(GStrv) versions = g_key_file_get_string_list (metakey, groups[i],
FLATPAK_METADATA_KEY_VERSIONS,
NULL, NULL);
gboolean subdirectories = g_key_file_get_boolean (metakey, groups[i],
FLATPAK_METADATA_KEY_SUBDIRECTORIES, NULL);
gboolean no_autodownload = g_key_file_get_boolean (metakey, groups[i],
@@ -13769,18 +13772,24 @@ flatpak_dir_find_local_related_for_metadata (FlatpakDir *self,
FLATPAK_METADATA_KEY_AUTODELETE, NULL);
gboolean locale_subset = g_key_file_get_boolean (metakey, groups[i],
FLATPAK_METADATA_KEY_LOCALE_SUBSET, NULL);
const char *branch;
g_autofree char *extension_ref = NULL;
g_autofree char *checksum = NULL;
g_autofree char *extension_collection_id = NULL;
const char *default_branches[] = { NULL, NULL};
const char **branches;
int branch_i;
/* Parse actual extension name */
flatpak_parse_extension_with_tag (tagged_extension, &extension, NULL);
if (version)
branch = version;
if (versions)
branches = (const char **) versions;
else
branch = parts[3];
{
if (version)
default_branches[0] = version;
else
default_branches[0] = parts[3];
branches = default_branches;
}
extension_collection_id = g_key_file_get_string (metakey, groups[i],
FLATPAK_METADATA_KEY_COLLECTION_ID, NULL);
@@ -13800,40 +13809,47 @@ flatpak_dir_find_local_related_for_metadata (FlatpakDir *self,
g_clear_pointer (&extension_collection_id, g_free);
extension_collection_id = g_strdup (collection_id);
extension_ref = g_build_filename ("runtime", extension, parts[2], branch, NULL);
if (flatpak_repo_resolve_rev (self->repo,
collection_id,
remote_name,
extension_ref,
FALSE,
&checksum,
NULL,
NULL))
for (branch_i = 0; branches[branch_i] != NULL; branch_i++)
{
add_related (self, related, extension, extension_collection_id, extension_ref,
checksum, no_autodownload, download_if, autoprune_unless, autodelete, locale_subset);
}
else if (subdirectories)
{
g_autoptr(GPtrArray) matches = local_match_prefix (self, extension_ref, remote_name);
int j;
for (j = 0; j < matches->len; j++)
{
const char *match = g_ptr_array_index (matches, j);
g_autofree char *match_checksum = NULL;
g_autofree char *extension_ref = NULL;
g_autofree char *checksum = NULL;
const char *branch = branches[branch_i];
if (flatpak_repo_resolve_rev (self->repo,
collection_id,
remote_name,
match,
FALSE,
&match_checksum,
NULL,
NULL))
extension_ref = g_build_filename ("runtime", extension, parts[2], branch, NULL);
if (flatpak_repo_resolve_rev (self->repo,
collection_id,
remote_name,
extension_ref,
FALSE,
&checksum,
NULL,
NULL))
{
add_related (self, related, extension, extension_collection_id, extension_ref,
checksum, no_autodownload, download_if, autoprune_unless, autodelete, locale_subset);
}
else if (subdirectories)
{
g_autoptr(GPtrArray) matches = local_match_prefix (self, extension_ref, remote_name);
int j;
for (j = 0; j < matches->len; j++)
{
add_related (self, related, extension,
extension_collection_id, match, match_checksum,
no_autodownload, download_if, autoprune_unless, autodelete, locale_subset);
const char *match = g_ptr_array_index (matches, j);
g_autofree char *match_checksum = NULL;
if (flatpak_repo_resolve_rev (self->repo,
collection_id,
remote_name,
match,
FALSE,
&match_checksum,
NULL,
NULL))
{
add_related (self, related, extension,
extension_collection_id, match, match_checksum,
no_autodownload, download_if, autoprune_unless, autodelete, locale_subset);
}
}
}
}