diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index 45995a30..0adb65d4 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -1035,14 +1035,22 @@ process_verify_result (OtPullData *pull_data, GError **error) { if (result == NULL) - return FALSE; + { + g_prefix_error (error, "Commit %s: ", checksum); + return FALSE; + } /* Allow callers to output the results immediately. */ g_signal_emit_by_name (pull_data->repo, "gpg-verify-result", checksum, result); - return ostree_gpg_verify_result_require_valid_signature (result, error); + if (!ostree_gpg_verify_result_require_valid_signature (result, error)) + { + g_prefix_error (error, "Commit %s: ", checksum); + return FALSE; + } + return TRUE; } static gboolean @@ -1060,8 +1068,9 @@ gpg_verify_unwritten_commit (OtPullData *pull_data, if (!detached_metadata) { - g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, - "No detached metadata found for GPG verification"); + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, + "Commit %s: no detached metadata found for GPG verification", + checksum); return FALSE; } diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 3b3aa664..88e430b8 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -4356,8 +4356,8 @@ _ostree_repo_gpg_verify_with_metadata (OstreeRepo *self, _OSTREE_METADATA_GPGSIGS_TYPE); if (!signaturedata) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, - "GPG verification enabled, but no signatures found (use gpg-verify=false in remote config to disable)"); + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, + "GPG verification enabled, but no signatures found (use gpg-verify=false in remote config to disable)"); return NULL; } @@ -4474,7 +4474,12 @@ ostree_repo_verify_commit (OstreeRepo *self, keyringdir, extra_keyring, cancellable, error); - return ostree_gpg_verify_result_require_valid_signature (result, error); + if (!ostree_gpg_verify_result_require_valid_signature (result, error)) + { + g_prefix_error (error, "Commit %s: ", commit_checksum); + return FALSE; + } + return TRUE; } /**