{"thread":{"id":"50782","subject":"[PATCH 1/1] t/lib-gpg.sh: fix GPG keyring import options","startedAt":"2019-03-19T23:15:07Z","lastAt":"2019-03-19T23:15:07Z","messageCount":1,"participants":["Dave Huseby"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"371933","messageId":"20190319231501.2dh4j3asns3e7gqz@localhost","threadId":"50782","inReplyTo":null,"subject":"[PATCH 1/1] t/lib-gpg.sh: fix GPG keyring import options","fromName":"Dave Huseby","fromEmail":"dhuseby@linuxfoundation.org","sentAt":"2019-03-19T23:15:01Z","receivedAt":"2019-03-19T23:15:07Z","isPatch":true,"sender":{"key":"dhuseby@linuxfoundation.org","avatar":null},"body":"Fix the way GPG keyrings are imported during testing to prevent GPG from \nprompting for approval to change the default config. This appears to have no\nadverse affects on GPG users with \"normal\" configurations but fixes the\nalways-interactive prompting I see with my multi-keyring setup.\n\nSigned-off-by: Dave Huseby <dhuseby@linuxfoundation.org>\n---\n t/lib-gpg.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/lib-gpg.sh b/t/lib-gpg.sh\nindex 8d28652b72..4f3675f410 100755\n--- a/t/lib-gpg.sh\n+++ b/t/lib-gpg.sh\n@@ -32,8 +32,8 @@ then\n \t\tGNUPGHOME=\"$(pwd)/gpghome\" &&\n \t\texport GNUPGHOME &&\n \t\t(gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&\n-\t\tgpg --homedir \"${GNUPGHOME}\" 2>/dev/null --import \\\n-\t\t\t\"$TEST_DIRECTORY\"/lib-gpg/keyring.gpg &&\n+\t\tgpg --import-options merge-only --homedir \"${GNUPGHOME}\" 2>/dev/null \\\n+      --import \"$TEST_DIRECTORY\"/lib-gpg/keyring.gpg &&\n \t\tgpg --homedir \"${GNUPGHOME}\" 2>/dev/null --import-ownertrust \\\n \t\t\t\"$TEST_DIRECTORY\"/lib-gpg/ownertrust &&\n \t\tgpg --homedir \"${GNUPGHOME}\" </dev/null >/dev/null 2>&1 \\\n-- \n2.11.0\n\n"}]}