From ef1aeb7458612e933b0ee58ae0eb6c7590622b5d Mon Sep 17 00:00:00 2001 From: Denis Pynkin Date: Tue, 7 Apr 2020 01:11:29 +0300 Subject: [PATCH] lib/repo-pull: fix GPG check while pulling remote If GPG support is disabled in a build time we should to check if any of options "gpg_verify" or "gpg_verify_summary" is set to TRUE instead of checking if they are passed via options while pulling from remote. Fixed the failure with assertion of `ostree find-remotes --pull --mirror` calling (`tests/test-pull-collections.sh`) if libostree has been compiled without GPG support. Signed-off-by: Denis Pynkin --- src/libostree/ostree-repo-pull.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index 454eaf8a..56c0508d 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -3856,7 +3856,7 @@ ostree_repo_pull_with_options (OstreeRepo *self, #ifdef OSTREE_DISABLE_GPGME /* Explicitly fail here if gpg verification is requested and we have no GPG support */ - if (opt_gpg_verify_set || opt_gpg_verify_summary_set) + if (pull_data->gpg_verify || pull_data->gpg_verify_summary) { g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "'%s': GPG feature is disabled in a build time",