diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-07-31 10:29:25 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-07-31 10:29:25 +0200 |
| commit | 215598df84c092f801fe154e510c68fcc263b3ba (patch) | |
| tree | 72ebb81f3fe25e68ad68959e2787c1e8e96ebfb4 | |
| parent | 4039798d971752325d097bfbdc9011b5e9efd29c (diff) | |
| download | apt-215598df84c092f801fe154e510c68fcc263b3ba.tar.gz | |
apt-key: ignore any error produced by gpgconf --kill
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
| -rw-r--r-- | cmdline/apt-key.in | 2 |
1 files changed, 1 insertions, 1 deletions
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" } |