lib/pull: Drop duplicate/different error for GPG but no detached meta
authorColin Walters <walters@verbum.org>
Fri, 13 Oct 2017 19:22:10 +0000 (15:22 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Mon, 16 Oct 2017 15:32:39 +0000 (15:32 +0000)
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

src/libostree/ostree-repo-pull.c

index ab69519c9e74beaf568277c975ad2ae42f754775..faea1a2f0e69394c43c9be242beace883e8104a1 100644 (file)
@@ -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,