Re: [pacman-dev] [PATCH v2 2/2] libalpm: set errno in signing dummy functions

[Allan McRae]

On 15/10/19 7:30 pm, morganamilo wrote:
> This allows pacman to print the correct error message when checking keys
> and libalpm has been compiled without gpgme support.
> ---

Thanks,

Both patches look good and will be pushed before release.

Allan

[pacman-dev] [PATCH v2 2/2] libalpm: set errno in signing dummy functions

[morganamilo]

This allows pacman to print the correct error message when checking keys
and libalpm has been compiled without gpgme support.
---
v2: remove UNUSED

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 */
-- 
2.23.0