From 719efe19c7372ee7acc243d3d16180163f0bc132 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Tue, 15 Oct 2019 10:30:02 +0100 Subject: libalpm: set errno in signing dummy functions This allows pacman to print the correct error message when checking keys and libalpm has been compiled without gpgme support. Signed-off-by: Allan McRae --- lib/libalpm/signing.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index fc537dd3..7fed862e 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -788,21 +788,24 @@ error: } #else /* HAVE_LIBGPGME */ -int _alpm_key_in_keychain(alpm_handle_t UNUSED *handle, const char UNUSED *fpr) +int _alpm_key_in_keychain(alpm_handle_t *handle, const char UNUSED *fpr) { + handle->pm_errno = ALPM_ERR_MISSING_CAPABILITY_SIGNATURES; return -1; } -int _alpm_key_import(alpm_handle_t UNUSED *handle, const char UNUSED *uid, +int _alpm_key_import(alpm_handle_t *handle, const char UNUSED *uid, const char UNUSED *fpr) { + handle->pm_errno = ALPM_ERR_MISSING_CAPABILITY_SIGNATURES; return -1; } -int _alpm_gpgme_checksig(alpm_handle_t UNUSED *handle, const char UNUSED *path, +int _alpm_gpgme_checksig(alpm_handle_t *handle, const char UNUSED *path, const char UNUSED *base64_sig, alpm_siglist_t *siglist) { siglist->count = 0; + handle->pm_errno = ALPM_ERR_MISSING_CAPABILITY_SIGNATURES; return -1; } #endif /* HAVE_LIBGPGME */ -- cgit v1.2.3-24-g4f1b