From: Colin Walters <walters@verbum.org>
Date: Fri, 13 Oct 2017 19:22:10 +0000 (-0400)
Subject: lib/pull: Drop duplicate/different error for GPG but no detached meta
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~30^2~55
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=22029d71c977674cfc1baebdbd9b769840a1b68c;p=ostree.git

lib/pull: Drop duplicate/different error for GPG but no detached meta

Prep for a later patch to do GPG verification before writing commit objects;
`_ostree_repo_gpg_verify_with_metadata()` already handles this, and so dropping
this gives us consistent error messages.

Closes: #1269
Approved by: jlebon
---

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index ab69519c..faea1a2f 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -1363,14 +1363,6 @@ gpg_verify_unwritten_commit (OtPullData         *pull_data,
       g_autoptr(OstreeGpgVerifyResult) result = NULL;
       g_autoptr(GBytes) signed_data = g_variant_get_data_as_bytes (commit);
 
-      if (!detached_metadata)
-        {
-          g_set_error (error, OSTREE_GPG_ERROR, OSTREE_GPG_ERROR_NO_SIGNATURE,
-                       "Commit %s: no detached metadata found for GPG verification",
-                       checksum);
-          return FALSE;
-        }
-
       result = _ostree_repo_gpg_verify_with_metadata (pull_data->repo,
                                                       signed_data,
                                                       detached_metadata,