From 31b9b264c1df2fc9a4f5c846d5d1735b5fbd7050 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 3 Nov 2012 00:21:48 +1000 Subject: Check keys are in keyring before package validation Keys used to create signatures are checked for presence in the keyring before package validation is performed. Signed-off-by: Allan McRae Conflicts: lib/libalpm/alpm.h Signed-off-by: Allan McRae --- src/pacman/callback.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src') diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 93418db3..edd5b398 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -212,6 +212,14 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("checking package integrity...\n")); } break; + case ALPM_EVENT_KEYRING_START: + if(config->noprogressbar) { + printf(_("checking keyring...\n")); + } + break; + case ALPM_EVENT_KEY_DOWNLOAD_START: + printf(_("downloading required keys...\n")); + break; case ALPM_EVENT_LOAD_START: if(config->noprogressbar) { printf(_("loading package files...\n")); @@ -259,6 +267,8 @@ void cb_event(alpm_event_t event, void *data1, void *data2) case ALPM_EVENT_RESOLVEDEPS_DONE: case ALPM_EVENT_INTERCONFLICTS_DONE: case ALPM_EVENT_INTEGRITY_DONE: + case ALPM_EVENT_KEYRING_DONE: + case ALPM_EVENT_KEY_DOWNLOAD_DONE: case ALPM_EVENT_LOAD_DONE: case ALPM_EVENT_DELTA_INTEGRITY_DONE: case ALPM_EVENT_DELTA_PATCHES_DONE: @@ -446,6 +456,9 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, case ALPM_PROGRESS_INTEGRITY_START: opr = _("checking package integrity"); break; + case ALPM_PROGRESS_KEYRING_START: + opr = _("checking keys in keyring"); + break; case ALPM_PROGRESS_LOAD_START: opr = _("loading package files"); break; -- cgit v1.2.3-70-g09d2