From af284d5fdb0ef15dbb7a2082380e2ec586599774 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Mon, 28 Oct 2013 09:58:28 -0400 Subject: support ALPM_SIG_USE_DEFAULT for file siglevels This brings file siglevels in line with how db siglevels are handled. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- src/pacman/conf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/pacman') diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cd357ab6..231fe2ad 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -405,9 +405,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, static void merge_siglevel(alpm_siglevel_t *base, alpm_siglevel_t *over) { alpm_siglevel_t level = *over; - if(level & ALPM_SIG_USE_DEFAULT) { - level = *base; - } else { + if(!(level & ALPM_SIG_USE_DEFAULT)) { if(!(level & ALPM_SIG_PACKAGE_SET)) { level |= *base & ALPM_SIG_PACKAGE; level |= *base & ALPM_SIG_PACKAGE_OPTIONAL; -- cgit v1.2.3-70-g09d2