mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-24 16:57:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't auto-install sources for extensions

Browse Source 
There was a bug in the extension point matcher which made it
install `org.gnome.Totem.Videosite.YouTubeDl.Sources` (in addition to
`org.gnome.Totem.Videosite.YouTubeDl`) for the `org.gnome.Totem.Videosite`
extension.

We just need to make sure we only match the extension prefix if there
is a single element in the extension name following the extension
name (i.e. '.YouTubeDl', not '.YouTubeDl.Sources').

This fixes https://github.com/flatpak/flatpak/issues/3973
This commit is contained in:
Alexander Larsson
2020-11-17 16:54:42 +01:00
committed by Alexander Larsson
parent c4c57312ba
commit f650c303e3
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/flatpak-utils.c
View File

@@ -2110,6 +2110,8 @@ flatpak_summary_match_subrefs (GVariant *summary_v,
VarRefMapEntryRef entry = var_ref_map_get_at (ref_map, i);
const char *cur;
const char *id_start;
const char *id_suffix;
const char *id_end;
cur = var_ref_map_entry_get_ref (entry);
@@ -2124,9 +2126,19 @@ flatpak_summary_match_subrefs (GVariant *summary_v,
id_start = strchr (cur, '/');
if (id_start == NULL)
continue;
id_start += 1;
id_end = strchr (id_start, '/');
if (id_end == NULL)
continue;
/* But only prefix of id */
if (!g_str_has_prefix (id_start + 1, parts_prefix))
if (!g_str_has_prefix (id_start, parts_prefix))
continue;
/* And no dots (we want to install prefix.$ID, but not prefix.$ID.Sources) */
id_suffix = id_start + strlen (parts_prefix);
if (memchr (id_suffix, '.', id_end - id_suffix) != NULL)
continue;
FlatpakDecomposed *d = flatpak_decomposed_new_from_ref (cur, NULL);