change gpg import message to resemble gpg --list-keys

Dan: const pointers, don't worry about bitfields.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 3889c088..4b2ad2aa 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -347,10 +347,14 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
 			{
 				alpm_pgpkey_t *key = data1;
 				char created[12];
+				const char *revoked = "";
 				time_t time = (time_t)key->created;
 				strftime(created, 12, "%Y-%m-%d", localtime(&time));
-				*response = yesno(_(":: Import PGP key %s, \"%s\", created %s?"),
-						key->fingerprint, key->uid, created);
+				if (key->revoked) {
+					revoked = " (revoked)";
+				}
+				*response = yesno(_(":: Import PGP key %d/%s, \"%s\", created: %s%s?"),
+						key->length, key->fingerprint, key->uid, created, revoked);
 			}
 			break;
 	}