packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/pull: Clarify use of unsigned summary support 

Update the comments and remove an unneeded variable to make it clear
that the find_remotes_async() / pull_from_remotes_async() functions use
the unsigned summary support.

This is a follow-up of commit 8c148eb7e "lib/repo-finder: Emit
gpg-verify-summary=false in dynamic remote config".

Closes: #1195
Approved by: pwithnall
This commit is contained in:
Matthew Leeds 2017-09-19 16:34:11 -07:00 committed by Atomic Bot
parent e3c3ec5dd9
commit 74cf3594ee
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libostree/ostree-repo-pull.c
View File

@ -4544,7 +4544,7 @@ static void find_remotes_cb (GObject *obj,
* will typically be all available finders using their default options (but * will typically be all available finders using their default options (but
* this is not guaranteed). * this is not guaranteed).
* *
* GPG verification of the summary and all commits will be used unconditionally. * GPG verification of commits will be used unconditionally.
* *
* This will use the thread-default #GMainContext, but will not iterate it. * This will use the thread-default #GMainContext, but will not iterate it.
* *
@ -4843,7 +4843,7 @@ find_remotes_cb (GObject *obj,
for (i = 0; i < results->len; i++) for (i = 0; i < results->len; i++)
{ {
OstreeRepoFinderResult *result = g_ptr_array_index (results, i); OstreeRepoFinderResult *result = g_ptr_array_index (results, i);
g_autoptr(GBytes) summary_bytes = NULL, summary_sig_bytes = NULL; g_autoptr(GBytes) summary_bytes = NULL;
g_autoptr(GVariant) summary_v = NULL; g_autoptr(GVariant) summary_v = NULL;
guint64 summary_last_modified; guint64 summary_last_modified;
g_autoptr(GVariant) summary_refs = NULL; g_autoptr(GVariant) summary_refs = NULL;
@ -4860,13 +4860,12 @@ find_remotes_cb (GObject *obj,
g_debug ("%s: Fetching summary for remote ‘%s’ with keyring ‘%s’.", g_debug ("%s: Fetching summary for remote ‘%s’ with keyring ‘%s’.",
G_STRFUNC, result->remote->name, result->remote->keyring); G_STRFUNC, result->remote->name, result->remote->keyring);
/* Download the summary and signature, and validate the signature. This /* Download the summary. This will load from the cache if possible. */
* will load from the cache if possible. */
ostree_repo_remote_fetch_summary_with_options (self, ostree_repo_remote_fetch_summary_with_options (self,
result->remote->name, result->remote->name,
NULL, /* no options */ NULL, /* no options */
&summary_bytes, &summary_bytes,
&summary_sig_bytes, NULL,
cancellable, cancellable,
&error); &error);
@ -5274,7 +5273,7 @@ copy_option (GVariantDict *master_options,
* immediately. The results of any successfully completed downloads at that * immediately. The results of any successfully completed downloads at that
* point will remain cached in the local repository. * point will remain cached in the local repository.
* *
* GPG verification of the summary and all commits will be used unconditionally. * GPG verification of commits will be used unconditionally.
* *
* The following @options are currently defined: * The following @options are currently defined:
* *