diff options
| author | morganamilo <morganamilo@archlinux.org> | 2021-06-03 21:25:04 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2021-09-04 20:43:16 +1000 |
| commit | 625f3d645bc2d256e12dc82521d86c895067a0d9 (patch) | |
| tree | 84ebf7c788845a7d8e819cf667011f2ca31403cd /src | |
| parent | e187aa9b487dd99d66d663773ae9885f9c9d3930 (diff) | |
libalpm: don't use alpm_pgpkey_t in import question
When constructing an import question we never really used a proper gpg
key. We just zero initialize the key, set the uid and fingerprint, and
sent that to the front end.
Instead lets just give the import question a uid and fingerprint field.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/callback.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 75c74f8b..2579b98a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -541,12 +541,12 @@ void cb_question(void *ctx, alpm_question_t *question) { alpm_question_import_key_t *q = &question->import_key; /* the uid is unknown with db signatures */ - if (q->key->uid == NULL) { + if (q->uid == NULL) { q->import = yesno(_("Import PGP key %s?"), - q->key->fingerprint); + q->fingerprint); } else { q->import = yesno(_("Import PGP key %s, \"%s\"?"), - q->key->fingerprint, q->key->uid); + q->fingerprint, q->uid); } } break; |