From 10b8cd75b36d5a87032780058321fccdc90210c7 Mon Sep 17 00:00:00 2001
From: Rémy Oudompheng <remy@archlinux.org>
Date: Thu, 21 Apr 2011 08:13:05 +0200
Subject: sync.c: remove unnecessary check for PM_PGP_VERIFY_UNKNOWN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The value PM_PGP_VERIFY_UNKNOWN is reserved to error cases,
now that the signature verification level defaults to the
globally set level. The only error case is when handle == NULL,
which is false in the context of _alpm_sync_commit().
Signed-off-by: Rémy Oudompheng <remy@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
lib/libalpm/sync.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 964cfdba..63ea2b2d 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -852,13 +852,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
check_sig = _alpm_db_get_sigverify_level(sdb);
- if(check_sig == PM_PGP_VERIFY_UNKNOWN) {
- _alpm_log(PM_LOG_ERROR, _("failed to determine signature verification "
- "level for database: %s\n"), sdb->treename);
- pm_errno = PM_ERR_PKG_INVALID;
- goto error;
- }
-
if(check_sig != PM_PGP_VERIFY_NEVER) {
int ret = _alpm_gpgme_checksig(filepath, pgpsig);
if((check_sig == PM_PGP_VERIFY_ALWAYS && ret != 0) ||
--
cgit v1.2.3-70-g09d2