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

pull: Dedup code for checking for > 0 valid results 

We have a public API for this, let's use it internally.

Closes: #589
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-11-18 20:22:10 -05:00 committed by Atomic Bot
parent c1c70bceb7
commit abbd7acaf3
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1086,12 +1086,8 @@ scan_commit_object (OtPullData *pull_data,
"gpg-verify-result", "gpg-verify-result",
checksum, result); checksum, result);
if (ostree_gpg_verify_result_count_valid (result) == 0) if (!ostree_gpg_verify_result_require_valid_signature (result, error))
{ goto out;
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"GPG signatures found, but none are in trusted keyring");
goto out;
}
} }
if (!ostree_repo_load_commit (pull_data->repo, checksum, &commit, &commitstate, error)) if (!ostree_repo_load_commit (pull_data->repo, checksum, &commit, &commitstate, error))
@ -2737,15 +2733,8 @@ ostree_repo_pull_with_options (OstreeRepo *self,
NULL, NULL,
cancellable, cancellable,
error); error);
if (result == NULL) if (!ostree_gpg_verify_result_require_valid_signature (result, error))
goto out; goto out;
if (ostree_gpg_verify_result_count_valid (result) == 0)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"GPG signatures found, but none are in trusted keyring");
goto out;
}
} }
if (pull_data->summary) if (pull_data->summary)