Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libalpm/handle.c7
-rw-r--r--src/pacman/conf.c10
2 files changed, 4 insertions, 13 deletions
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index dcd81cea..7402be50 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -39,17 +39,12 @@
#include "trans.h"
#include "alpm.h"
-alpm_handle_t *_alpm_handle_new()
+alpm_handle_t *_alpm_handle_new(void)
{
alpm_handle_t *handle;
CALLOC(handle, 1, sizeof(alpm_handle_t), return NULL);
-#ifdef HAVE_LIBGPGME
- handle->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL |
- ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL;
-#endif
-
return handle;
}
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index e8b34f7d..cc1fb724 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -54,7 +54,8 @@ config_t *config_new(void)
newconfig->op = PM_OP_MAIN;
newconfig->logmask = ALPM_LOG_ERROR | ALPM_LOG_WARNING;
newconfig->configfile = strdup(CONFFILE);
- newconfig->siglevel = ALPM_SIG_USE_DEFAULT;
+ newconfig->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL |
+ ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL;
return newconfig;
}
@@ -567,12 +568,7 @@ static int setup_libalpm(void)
alpm_option_set_cachedirs(handle, config->cachedirs);
}
- if(config->siglevel != ALPM_SIG_USE_DEFAULT) {
- alpm_option_set_default_siglevel(handle, config->siglevel);
- }
- /* retrieve the set or default siglevel from the backend at this point;
- * this way all future DB settings base their setting off this value */
- config->siglevel = alpm_option_get_default_siglevel(handle);
+ alpm_option_set_default_siglevel(handle, config->siglevel);
if(config->xfercommand) {
alpm_option_set_fetchcb(handle, download_with_xfercommand);