Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-09-20 16:49:50 -0500
committerDan McGee <dan@archlinux.org>2011-09-22 10:35:52 -0500
commit0a4a5cea97f75d5d38e9cb33d5f47f0c36c0dffb (patch)
treea9e86d18bf96f1d87c1d66fe043d3da7bcdb7c9b
parent3e4749fe3ec3f14e4107363a85b953b4a0a747f7 (diff)
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>
-rw-r--r--lib/libalpm/alpm.h1
-rw-r--r--src/pacman/callback.c9
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index c864fb9f..3b6b279c 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -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 */
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index a01fc07e..9d4663a0 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -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) {