diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-10-28 09:58:28 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-11-08 09:28:05 +1000 |
| commit | af284d5fdb0ef15dbb7a2082380e2ec586599774 (patch) | |
| tree | c1212e5acaef78afa98669a65f48653eb748d00d /src | |
| parent | 88df07717de868dc2bd2424afefaea6c77efa4c0 (diff) | |
| download | pacman-af284d5fdb0ef15dbb7a2082380e2ec586599774.tar.xz | |
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 <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/conf.c | 4 |
1 files changed, 1 insertions, 3 deletions
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; |