Skip to content

Commit fa47dd6

Browse files
tmzullingergitster
authored andcommitted
t/lib-gpg: reload gpg components after updating trustlist
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 2e285e7 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a075e79 commit fa47dd6

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

t/lib-gpg.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ test_lazy_prereq GPGSM '
7575
gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
7676
awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
7777
>"${GNUPGHOME}/trustlist.txt" &&
78+
(gpgconf --reload all || : ) &&
7879
7980
echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
8081
-u [email protected] -o /dev/null --sign -

0 commit comments

Comments
 (0)