[PATCH v4 2/3] t/lib-gpg: reload gpg components after updating trustlist
- From
Fabian Stelzer <fs@gigacodes.de>
- Date
- Mar 4, 2022, 10:25 UTC
- Message-ID
- <20220304102519.623896-2-fs@gigacodes.de>
- In-Reply-To
- <20220302090250.590450-1-fs@gigacodes.de>
From: Todd Zullinger <tmz@pobox.com>
With gpgsm from gnupg-2.3, the changes to the trustlist.txt do not appear to be picked up without refreshing the gpg-agent. Use the 'all' keyword to reload all of the gpg components. The scdaemon is started as a child of gpg-agent, for example.
We used to have a --kill at this spot, but I removed it in 2e285e7803 (t/lib-gpg: drop redundant killing of gpg-agent, 2019-02-07). It seems like it might be necessary (again) for 2.3.
Signed-off-by: Todd Zullinger <tmz@pobox.com> --- t/lib-gpg.sh | 1 + 1 file changed, 1 insertion(+)
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 6bc083ca77..38e2c0f4fb 100644 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -75,6 +75,7 @@ test_lazy_prereq GPGSM ' gpgsm --homedir "${GNUPGHOME}" -K --with-colons | awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \ >"${GNUPGHOME}/trustlist.txt" && + (gpgconf --reload all || : ) && echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ -u committer@example.com -o /dev/null --sign -
-- 2.35.1