summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2018-05-29 17:57:35 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2018-06-25 12:08:29 +0200
commitca28001a735e10339b104ad757e47219ec11bcb6 (patch)
treeaaaedf4790b21abdce84a8ebf546fbde44eae718
parent6440cd39f79e68b8bc0dc3669bdeaee3c4a3b565 (diff)
downloadapt-ca28001a735e10339b104ad757e47219ec11bcb6.tar.gz
apt-key: Pass all instead of gpg-agent to gpgconf --kill
We want to kill everything using our temporary directory. LP: #1773992 (cherry picked from commit 819426013c6ca6310bb469440702b6295dba4498)
-rw-r--r--cmdline/apt-key.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 5bc5462d2..55295d302 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -621,7 +621,7 @@ cleanup_gpg_home() {
cat >&2 "$GPGHOMEDIR/aptwarnings.log"
fi
if command_available 'gpgconf'; then
- GNUPGHOME="${GPGHOMEDIR}" gpgconf --kill gpg-agent >/dev/null 2>&1 || true
+ GNUPGHOME="${GPGHOMEDIR}" gpgconf --kill all >/dev/null 2>&1 || true
fi
rm -rf "$GPGHOMEDIR"
}