Browse Source

apt-key: ignore gpg1 already imported secret key import failure

On Travis and co the default gpg implementation is gpg1 which for some
reason fails if a secret key which was already imported is imported
again. We would prefer it to be a NOP like gpg2 handles it so we crudely
check the error message. apt-key usually doesn't deal with secret keys –
it only learned to do it for manual testing and the integration
framework usage, so no public interface is effected.

Triggered-By: 4ce2f35248
Gbp-Dch: Ignore
tags/debian/1.4_beta3
David Kalnischkies 4 years ago
parent
commit
9544398fce
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      cmdline/apt-key.in

+ 5
- 2
cmdline/apt-key.in View File

@@ -675,8 +675,11 @@ exec '$(escape_shell "${GPG_EXE}")' --ignore-time-conflict --no-options --no-def
# for advanced operations, we might really need a secret keyring after all
if [ -n "$FORCED_SECRET_KEYRING" ] && [ -r "$FORCED_SECRET_KEYRING" ]; then
if ! aptkey_execute "$GPG" -v --batch --import "$FORCED_SECRET_KEYRING" >"${GPGHOMEDIR}/gpgoutput.log" 2>&1; then
cat >&2 "${GPGHOMEDIR}/gpgoutput.log"
false
# already imported keys cause gpg1 to fail for some reason… ignore this error
if ! grep -q 'already in secret keyring' "${GPGHOMEDIR}/gpgoutput.log"; then
cat >&2 "${GPGHOMEDIR}/gpgoutput.log"
false
fi
fi
else
# and then, there are older versions of gpg which panic and implode


Loading…
Cancel
Save