Stig Palmquist <s...@stig.io> writes:

> gpgsm --list-keys output changed the label for fingerprints from
> "fingerprint: " to "sha[12] fpr: " breaking tests with gnupg 2.3. this
> adds support for both.
> ---
>  test/test-lib.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index 6bc0b723..3de608f9 100644
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -145,7 +145,7 @@ add_gpgsm_home () {
>      mkdir -p -m 0700 "$GNUPGHOME"
>      gpgsm --batch --no-tty --no-common-certs-import --pinentry-mode=loopback 
> --passphrase-fd 3 \
>         --disable-dirmngr --import  >"$GNUPGHOME"/import.log 2>&1 3<<<'' 
> <$NOTMUCH_SRCDIR/test/smime/0xE0972A47.p12
> -    fpr=$(gpgsm --batch --list-key test_su...@notmuchmail.org | sed -n 
> 's/.*fingerprint: //p')
> +    fpr=$(gpgsm --batch --list-key test_su...@notmuchmail.org | sed -n 
> 's/.*\(fingerprint\|sha1 fpr\): //p')

Thanks for the patch. It occurs to me that we should probably use
--with-colons to avoid future issues like this. It looks like we wabt
the row labelled "fpr"; I assume this has not changed with 2.3?

d
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org

Reply via email to