mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-01 19:41:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

appstream: Pull the right branch if the remote has a subset configured

Browse Source
This commit is contained in:
Alexander Larsson
2020-11-12 12:43:32 +01:00
committed by Alexander Larsson
parent a679fd5787
commit 5496c4e4ef
2 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
common/flatpak-dir.c
View File

@@ -4276,6 +4276,7 @@ flatpak_dir_deploy_appstream (FlatpakDir *self,
g_autofree char *filter_checksum = NULL;
g_autoptr(GRegex) allow_refs = NULL;
g_autoptr(GRegex) deny_refs = NULL;
g_autofree char *subset = NULL;
/* Keep a shared repo lock to avoid prunes removing objects we're relying on
* while we do the checkout. This could happen if the ref changes after we
@@ -4309,14 +4310,20 @@ flatpak_dir_deploy_appstream (FlatpakDir *self,
if (file_info != NULL)
old_dir = g_file_info_get_symlink_target (file_info);
branch = g_strdup_printf ("appstream2/%s", arch);
subset = flatpak_dir_get_remote_subset (self, remote);
if (subset)
branch = g_strdup_printf ("appstream2/%s-%s", subset, arch);
else
branch = g_strdup_printf ("appstream2/%s", arch);
if (!flatpak_repo_resolve_rev (self->repo, NULL, remote, branch, TRUE,
&new_checksum, cancellable, error))
return FALSE;
if (new_checksum == NULL)
if (new_checksum == NULL && subset == NULL)
{
/* Fall back to old branch */
/* Fall back to old branch (only exist on non-subsets) */
g_clear_pointer (&branch, g_free);
branch = g_strdup_printf ("appstream/%s", arch);
if (!flatpak_repo_resolve_rev (self->repo, NULL, remote, branch, TRUE,
@@ -4751,6 +4758,7 @@ flatpak_dir_update_appstream (FlatpakDir *self,
g_autoptr(GError) second_error = NULL;
g_autoptr(FlatpakRemoteState) state = NULL;
g_autofree char *appstream_commit = NULL;
g_autofree char *subset = NULL;
g_autoptr(GFile) appstream_sideload_path = NULL;
const char *installation;
gboolean is_oci;
@@ -4761,8 +4769,18 @@ flatpak_dir_update_appstream (FlatpakDir *self,
if (arch == NULL)
arch = flatpak_get_arch ();
new_branch = g_strdup_printf ("appstream2/%s", arch);
old_branch = g_strdup_printf ("appstream/%s", arch);
subset = flatpak_dir_get_remote_subset (self, remote);
if (subset)
{
new_branch = g_strdup_printf ("appstream2/%s-%s", subset, arch);
old_branch = g_strdup_printf ("appstream/%s-%s", subset, arch);
}
else
{
new_branch = g_strdup_printf ("appstream2/%s", arch);
old_branch = g_strdup_printf ("appstream/%s", arch);
}
is_oci = flatpak_dir_get_remote_oci (self, remote);
@@ -13218,11 +13236,16 @@ flatpak_dir_get_remote_subset (FlatpakDir *self,
{
GKeyFile *config = flatpak_dir_get_repo_config (self);
g_autofree char *group = get_group (remote_name);
g_autofree char *subset = NULL;
if (config == NULL)
return NULL;
return g_key_file_get_string (config, group, "xa.subset", NULL);
subset = g_key_file_get_string (config, group, "xa.subset", NULL);
if (subset == NULL || *subset == 0)
return NULL;
return g_steal_pointer (&subset);
}
gboolean

15
system-helper/flatpak-system-helper.c
View File

@@ -767,6 +767,7 @@ handle_deploy_appstream (FlatpakSystemHelper *object,
g_autoptr(GError) error = NULL;
g_autofree char *new_branch = NULL;
g_autofree char *old_branch = NULL;
g_autofree char *subset = NULL;
gboolean is_oci;
g_debug ("DeployAppstream %s %u %s %s %s", arg_repo_path, arg_flags, arg_origin, arg_arch, arg_installation);
@@ -798,8 +799,18 @@ handle_deploy_appstream (FlatpakSystemHelper *object,
is_oci = flatpak_dir_get_remote_oci (system, arg_origin);
new_branch = g_strdup_printf ("appstream2/%s", arg_arch);
old_branch = g_strdup_printf ("appstream/%s", arg_arch);
subset = flatpak_dir_get_remote_subset (system, arg_origin);
if (subset)
{
new_branch = g_strdup_printf ("appstream2/%s-%s", subset, arg_arch);
old_branch = g_strdup_printf ("appstream/%s-%s", subset, arg_arch);
}
else
{
new_branch = g_strdup_printf ("appstream2/%s", arg_arch);
old_branch = g_strdup_printf ("appstream/%s", arg_arch);
}
if (is_oci)
{