mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-07 23:43:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

dir: Pass summary and collection_id to fetch_remote_repo_metadata()

Browse Source 
All callers need to get this anyway, so lets only do it once.

Closes: #1575
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2018-04-10 14:44:57 +02:00
committed by Atomic Bot
parent 25c9b0a4a1
commit fedb0e5bd9
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common/flatpak-dir.c
View File

@@ -102,6 +102,14 @@ static char * flatpak_dir_lookup_ref_from_summary (FlatpakDir *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
static gboolean flatpak_dir_fetch_remote_repo_metadata (FlatpakDir *self,
const char *remote_name,
GVariant *summary,
const char *collection_id,
GCancellable *cancellable,
GError **error);
typedef struct typedef struct
{ {
GBytes *bytes; GBytes *bytes;
@@ -3048,6 +3056,7 @@ flatpak_dir_get_remote_metadata (FlatpakDir *self,
{ {
g_autoptr(GVariant) metadata = NULL; g_autoptr(GVariant) metadata = NULL;
g_autofree char *collection_id = NULL; g_autofree char *collection_id = NULL;
g_autoptr(GVariant) summary_v = NULL;
if (!flatpak_dir_ensure_repo (self, cancellable, error)) if (!flatpak_dir_ensure_repo (self, cancellable, error))
return NULL; return NULL;
@@ -3055,13 +3064,12 @@ flatpak_dir_get_remote_metadata (FlatpakDir *self,
if (!repo_get_remote_collection_id (self->repo, remote_name, &collection_id, error)) if (!repo_get_remote_collection_id (self->repo, remote_name, &collection_id, error))
return NULL; return NULL;
summary_v = fetch_remote_summary_file (self, remote_name, NULL, cancellable, error);
if (summary_v == NULL)
return NULL;
if (collection_id == NULL) if (collection_id == NULL)
{ {
g_autoptr(GVariant) summary_v = NULL;
summary_v = fetch_remote_summary_file (self, remote_name, NULL, cancellable, error);
if (summary_v == NULL)
return NULL;
metadata = g_variant_get_child_value (summary_v, 1); metadata = g_variant_get_child_value (summary_v, 1);
} }
@@ -3072,7 +3080,7 @@ flatpak_dir_get_remote_metadata (FlatpakDir *self,
g_autoptr(GVariant) commit_v = NULL; g_autoptr(GVariant) commit_v = NULL;
/* Make sure the branch is up to date. */ /* Make sure the branch is up to date. */
if (!flatpak_dir_fetch_remote_repo_metadata (self, remote_name, cancellable, error)) if (!flatpak_dir_fetch_remote_repo_metadata (self, remote_name, summary_v, collection_id, cancellable, error))
return NULL; return NULL;
/* Look up the commit containing the latest repository metadata. */ /* Look up the commit containing the latest repository metadata. */
@@ -9892,6 +9900,8 @@ flatpak_dir_fetch_remote_default_branch (FlatpakDir *self,
gboolean gboolean
flatpak_dir_fetch_remote_repo_metadata (FlatpakDir *self, flatpak_dir_fetch_remote_repo_metadata (FlatpakDir *self,
const char *remote_name, const char *remote_name,
GVariant *summary,
const char *collection_id,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
@@ -9902,6 +9912,8 @@ flatpak_dir_fetch_remote_repo_metadata (FlatpakDir *self,
g_autofree char *checksum_from_repo = NULL; g_autofree char *checksum_from_repo = NULL;
g_autofree char *refspec = NULL; g_autofree char *refspec = NULL;
g_assert (collection_id != NULL);
/* We can only fetch metadata if we’re going to verify it with GPG. */ /* We can only fetch metadata if we’re going to verify it with GPG. */
if (!ostree_repo_remote_get_gpg_verify (self->repo, remote_name, if (!ostree_repo_remote_get_gpg_verify (self->repo, remote_name,
&gpg_verify, error)) &gpg_verify, error))
@@ -9913,9 +9925,9 @@ flatpak_dir_fetch_remote_repo_metadata (FlatpakDir *self,
/* Look up the checksum as advertised by the summary file. If it differs from /* Look up the checksum as advertised by the summary file. If it differs from
* what we currently have on disk, try and pull the updated ostree-metadata ref. * what we currently have on disk, try and pull the updated ostree-metadata ref.
* This is how we implement caching. Ignore failure and pull the ref anyway. */ * This is how we implement caching. Ignore failure and pull the ref anyway. */
checksum_from_summary = flatpak_dir_lookup_ref_from_summary (self, remote_name, if (!flatpak_summary_lookup_ref (summary, collection_id, OSTREE_REPO_METADATA_REF, &checksum_from_summary, NULL))
OSTREE_REPO_METADATA_REF, return flatpak_fail (error, "No such ref (%s, %s) in remote %s", collection_id, OSTREE_REPO_METADATA_REF, remote_name);
NULL, NULL, NULL, NULL);
refspec = g_strdup_printf ("%s:%s", remote_name, OSTREE_REPO_METADATA_REF); refspec = g_strdup_printf ("%s:%s", remote_name, OSTREE_REPO_METADATA_REF);
if (!ostree_repo_resolve_rev (self->repo, refspec, TRUE, &checksum_from_repo, error)) if (!ostree_repo_resolve_rev (self->repo, refspec, TRUE, &checksum_from_repo, error))
return FALSE; return FALSE;
@@ -10282,7 +10294,7 @@ flatpak_dir_update_remote_configuration (FlatpakDir *self,
return FALSE; return FALSE;
if (collection_id != NULL && if (collection_id != NULL &&
!flatpak_dir_fetch_remote_repo_metadata (self, remote, cancellable, error)) !flatpak_dir_fetch_remote_repo_metadata (self, remote, summary, collection_id, cancellable, error))
return FALSE; return FALSE;
if (flatpak_dir_use_system_helper (self, NULL)) if (flatpak_dir_use_system_helper (self, NULL))

4
common/flatpak-dir.h
View File

@@ -628,10 +628,6 @@ gboolean flatpak_dir_list_remote_refs (FlatpakDir *self,
GHashTable **refs, GHashTable **refs,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
gboolean flatpak_dir_fetch_remote_repo_metadata (FlatpakDir *self,
const char *remote_name,
GCancellable *cancellable,
GError **error);
char * flatpak_dir_fetch_remote_title (FlatpakDir *self, char * flatpak_dir_fetch_remote_title (FlatpakDir *self,
const char *remote, const char *remote,
GCancellable *cancellable, GCancellable *cancellable,