diff options
| author | Allan McRae <allan@archlinux.org> | 2013-05-07 04:59:44 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-05-07 04:59:44 +0200 |
| commit | 0f988beff8794338485352dc1beafbfcdbb20db1 (patch) | |
| tree | e673c51058bddede4ef7f054e79c8ae799809628 /src/pacman/callback.c | |
| parent | c5716d0e72e47c8cd2ca1a437598eeee54111754 (diff) | |
| parent | a4a7336dff8155cfeb37341d1e9e56092439bae6 (diff) | |
| download | pacman-0f988beff8794338485352dc1beafbfcdbb20db1.tar.gz pacman-0f988beff8794338485352dc1beafbfcdbb20db1.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'src/pacman/callback.c')
| -rw-r--r-- | src/pacman/callback.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a743adc3..c57ef34a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -392,16 +392,16 @@ 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)); if(key->revoked) { - revoked = " (revoked)"; + *response = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s (revoked)?"), + key->length, key->pubkey_algo, key->fingerprint, key->uid, created); + } else { + *response = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s?"), + key->length, key->pubkey_algo, key->fingerprint, key->uid, created); } - - *response = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s%s?"), - key->length, key->pubkey_algo, key->fingerprint, key->uid, created, revoked); } break; } |