summaryrefslogtreecommitdiffstats
path: root/lib/libalpm
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2013-02-11 05:19:27 +0100
committerAllan McRae <allan@archlinux.org>2013-02-13 02:50:33 +0100
commit8fe8233dfa9c7827371168158784311cffb97556 (patch)
tree18cfbac3868e49030ca4afe97d12f80c7497ceff /lib/libalpm
parent87ffc648b7bce35dcc55dd43dce832669f83e894 (diff)
downloadpacman-8fe8233dfa9c7827371168158784311cffb97556.tar.gz
pacman-8fe8233dfa9c7827371168158784311cffb97556.tar.xz
Fix registering database with non-gpgme builds
We record whether the default SigLevel is set in order to add upon it for the *FileSigLevel entries. When using the only valid value of "SigLevel = Never" with non-gpgme builds, we need to ignore the ALPM_SIG_PACKAGE_SET flag when determining if we have a valid value for the database SigLevel. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/be_sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index 92be9491..1cbe055e 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -651,7 +651,7 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename,
_alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename);
#ifndef HAVE_LIBGPGME
- if(level != 0 && level != ALPM_SIG_USE_DEFAULT) {
+ if((level &= ~ALPM_SIG_PACKAGE_SET) != 0 && level != ALPM_SIG_USE_DEFAULT) {
RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL);
}
#endif