marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

common/dir: Factor out body of update_remote_configuration_for_summary() 

This will make it easier to add another version in upcoming commits
which gets the updated configuration from another source (an
ostree-metadata branch).

This commit introduces no functional changes.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
tingping/wmclass
Philip Withnall 2017-06-30 14:21:13 +01:00 committed by Alexander Larsson
parent 07607e3e00
commit 55ca5a9662
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
common/flatpak-dir.c
View File

@ -8194,14 +8194,14 @@ flatpak_dir_fetch_remote_summary (FlatpakDir *self,
return fetch_remote_summary_file (self, remote, NULL, cancellable, error);
}
gboolean
flatpak_dir_update_remote_configuration_for_summary (FlatpakDir *self,
const char *remote,
GVariant *summary,
gboolean dry_run,
gboolean *has_changed_out,
GCancellable *cancellable,
GError **error)
static gboolean
flatpak_dir_update_remote_configuration_for_dict (FlatpakDir *self,
const char *remote,
GVariant *metadata,
gboolean dry_run,
gboolean *has_changed_out,
GCancellable *cancellable,
GError **error)
{
/* We only support those configuration parameters that can
be set in the server when building the repo (see the
@ -8214,16 +8214,13 @@ flatpak_dir_update_remote_configuration_for_summary (FlatpakDir *self,
NULL
};
g_autoptr(GVariant) extensions = NULL;
g_autoptr(GPtrArray) updated_params = NULL;
GVariantIter iter;
g_autoptr(GBytes) gpg_keys = NULL;
updated_params = g_ptr_array_new_with_free_func (g_free);
extensions = g_variant_get_child_value (summary, 1);
g_variant_iter_init (&iter, extensions);
g_variant_iter_init (&iter, metadata);
if (g_variant_iter_n_children (&iter) > 0)
{
GVariant *value_var = NULL;
@ -8317,6 +8314,24 @@ flatpak_dir_update_remote_configuration_for_summary (FlatpakDir *self,
return TRUE;
}
gboolean
flatpak_dir_update_remote_configuration_for_summary (FlatpakDir *self,
const char *remote,
GVariant *summary,
gboolean dry_run,
gboolean *has_changed_out,
GCancellable *cancellable,
GError **error)
{
g_autoptr(GVariant) extensions = NULL;
extensions = g_variant_get_child_value (summary, 1);
return flatpak_dir_update_remote_configuration_for_dict (self, remote, extensions,
dry_run, has_changed_out,
cancellable, error);
}
gboolean
flatpak_dir_update_remote_configuration (FlatpakDir *self,
const char *remote,