[pacman-dev] [PATCH 1/2] signing: modify question text with unknwon uid

[Allan McRae]

On 7/10/19 11:35 pm, Christian Hesse wrote:
> From: Christian Hesse <mail at eworm.de>
> 
> 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 unknwon uid.

Typo

> 
> Signed-off-by: Christian Hesse <mail at eworm.de>
> ---
>  src/pacman/callback.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/src/pacman/callback.c b/src/pacman/callback.c
> index 25528100..3e67c1d8 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 unknwon with db signatures */

Typo

> +				if (q->key->uid == NULL) {
> +					q->import = yesno(_("Import PGP key %s with unknown uid?"),

This is not a great question.  I had a fair idea what you were doing,
and I still thought "what is a uid?".

Other options:

Import PGP key %s from unknown source?
Import PGP key %s?


> +							q->key->fingerprint);
> +				} else {
> +					q->import = yesno(_("Import PGP key %s, \"%s\"?"),
> +							q->key->fingerprint, q->key->uid);
> +				}
>  			}
>  			break;
>  	}
> .
>