From 215598df84c092f801fe154e510c68fcc263b3ba Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 31 Jul 2016 10:29:25 +0200
Subject: apt-key: ignore any error produced by gpgconf --kill
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

gpgconf wasn't always equipped with a --kill option as highlighted by
our testcases failing on Travis and co as these use a much older version
of gpg2. As this is just for cleaning up slightly faster we ignore any
error a call might produce and carry on. Use a recent enough gpg2
version if you need the immediate killing…

Gbp-Dch: Ignore
Reported-By: Travis CI
---
 cmdline/apt-key.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmdline/apt-key.in')

diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 80aacfa5e..0f9118492 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -483,7 +483,7 @@ shift
 cleanup_gpg_home() {
     if [ -z "$GPGHOMEDIR" ]; then return; fi
     if command_available 'gpgconf'; then
-	GNUPGHOME="${GPGHOMEDIR}" gpgconf --kill gpg-agent
+	GNUPGHOME="${GPGHOMEDIR}" gpgconf --kill gpg-agent >/dev/null 2>&1 || true
     fi
     rm -rf "$GPGHOMEDIR"
 }
-- 
cgit v1.2.3-70-g09d2