moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Add new import key question enum value and stub frontend function 

This is for eventual use by the PGP key import code. Breaking this into
a separate commit now makes the following patches a bit easier to
understand.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-09-20 16:49:50 -05:00
parent 3e4749fe3e
commit 0a4a5cea97
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libalpm/alpm.h
View File

@ -352,6 +352,7 @@ typedef enum _alpm_question_t {
ALPM_QUESTION_LOCAL_NEWER = (1 << 4),
ALPM_QUESTION_REMOVE_PKGS = (1 << 5),
ALPM_QUESTION_SELECT_PROVIDER = (1 << 6),
ALPM_QUESTION_IMPORT_KEY = (1 << 7)
} alpm_question_t;
/** Question callback */

9
src/pacman/callback.c
View File

@ -342,6 +342,15 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
(char *)data1,
alpm_strerror(*(enum _alpm_errno_t *)data2));
break;
case ALPM_QUESTION_IMPORT_KEY:
{
alpm_pgpkey_t *key = data1;
char created[12];
strftime(created, 12, "%Y-%m-%d", localtime(&(key->created)));
*response = yesno(_(":: Import PGP key %s, \"%s\", created %s?"),
key->fingerprint, key->uid, created);
}
break;
}
if(config->noask) {
if(config->ask & event) {