From: Colin Walters <walters@verbum.org>
Date: Sat, 19 Nov 2016 01:22:10 +0000 (-0500)
Subject: pull: Dedup code for checking for > 0 valid results
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~43^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=abbd7acaf3767659804f557563021eee0fe7d09a;p=ostree.git

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
---

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index fd35e87a..7a4ccfdb 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -1086,12 +1086,8 @@ scan_commit_object (OtPullData         *pull_data,
                              "gpg-verify-result",
                              checksum, result);
 
-      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 (!ostree_gpg_verify_result_require_valid_signature (result, error))
+        goto out;
     }
 
   if (!ostree_repo_load_commit (pull_data->repo, checksum, &commit, &commitstate, error))
@@ -2737,15 +2733,8 @@ ostree_repo_pull_with_options (OstreeRepo             *self,
                                                         NULL,
                                                         cancellable,
                                                         error);
-        if (result == NULL)
+        if (!ostree_gpg_verify_result_require_valid_signature (result, error))
           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)