bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add specific error for missing gpg support

Browse source 
"wrong or NULL argument passed" is a useless error for end users.

Fixes FS#60880.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2018-11-24 15:56:11 -08:00 • committed by Allan McRae
parent 508b4e3ec0
commit 3726693612
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libalpm/alpm.h
View file

@ -118,7 +118,9 @@ typedef enum _alpm_errno_t {
ALPM_ERR_LIBARCHIVE, ALPM_ERR_LIBARCHIVE,
ALPM_ERR_LIBCURL, ALPM_ERR_LIBCURL,
ALPM_ERR_EXTERNAL_DOWNLOAD, ALPM_ERR_EXTERNAL_DOWNLOAD,
ALPM_ERR_GPGME ALPM_ERR_GPGME,
/* Missing compile-time features */
ALPM_ERR_MISSING_CAPABILITY_SIGNATURES
} alpm_errno_t; } alpm_errno_t;
/** Returns the current error code from the handle. */ /** Returns the current error code from the handle. */

2
lib/libalpm/be_sync.c
View file

@ -788,7 +788,7 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename,
#ifndef HAVE_LIBGPGME #ifndef HAVE_LIBGPGME
if(level != ALPM_SIG_USE_DEFAULT) { if(level != ALPM_SIG_USE_DEFAULT) {
RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, NULL);
} }
#endif #endif

3
lib/libalpm/error.c
View file

@ -159,6 +159,9 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err)
return _("gpgme error"); return _("gpgme error");
case ALPM_ERR_EXTERNAL_DOWNLOAD: case ALPM_ERR_EXTERNAL_DOWNLOAD:
return _("error invoking external downloader"); return _("error invoking external downloader");
/* Missing compile-time features */
case ALPM_ERR_MISSING_CAPABILITY_SIGNATURES:
return _("compiled without signature support");
/* Unknown error! */ /* Unknown error! */
default: default:
return _("unexpected error"); return _("unexpected error");

6
lib/libalpm/handle.c
View file

@ -807,7 +807,7 @@ int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle,
handle->siglevel = level; handle->siglevel = level;
#else #else
if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { if(level != 0 && level != ALPM_SIG_USE_DEFAULT) {
RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, -1);
} }
#endif #endif
return 0; return 0;
@ -827,7 +827,7 @@ int SYMEXPORT alpm_option_set_local_file_siglevel(alpm_handle_t *handle,
handle->localfilesiglevel = level; handle->localfilesiglevel = level;
#else #else
if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { if(level != 0 && level != ALPM_SIG_USE_DEFAULT) {
RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, -1);
} }
#endif #endif
return 0; return 0;
@ -851,7 +851,7 @@ int SYMEXPORT alpm_option_set_remote_file_siglevel(alpm_handle_t *handle,
handle->remotefilesiglevel = level; handle->remotefilesiglevel = level;
#else #else
if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { if(level != 0 && level != ALPM_SIG_USE_DEFAULT) {
RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, -1);
} }
#endif #endif
return 0; return 0;