Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2019-10-07 16:00:56 +0200
committerAllan McRae <allan@archlinux.org>2019-10-09 15:39:22 +1000
commit379f7151056e804ba61caa6c72407ffa79c6649a (patch)
treec8aab7ac9ec165fd844754426b11b916605abd65
parentd5c3ed129c80c7a0676994d06c140f5e67b8b07d (diff)
signing: modify question text with unknwon uid
If the key's uid is unknown (for example with db signatures) the question was: :: Import PGP key 02FD1C7A934E614545849F19A6234074498E9CEE, "(null)"? [Y/n] Let's display a modified question for unknown uid. Signed-off-by: Christian Hesse <mail@eworm.de> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--src/pacman/callback.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 25528100..f40f2d47 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -456,8 +456,14 @@ void cb_question(alpm_question_t *question)
case ALPM_QUESTION_IMPORT_KEY:
{
alpm_question_import_key_t *q = &question->import_key;
- q->import = yesno(_("Import PGP key %s, \"%s\"?"),
- q->key->fingerprint, q->key->uid);
+ /* the uid is unknown with db signatures */
+ if (q->key->uid == NULL) {
+ q->import = yesno(_("Import PGP key %s?"),
+ q->key->fingerprint);
+ } else {
+ q->import = yesno(_("Import PGP key %s, \"%s\"?"),
+ q->key->fingerprint, q->key->uid);
+ }
}
break;
}