diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-08-16 15:46:19 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-08-17 09:52:32 +0200 |
| commit | 19fdf93d7363261227811a62157063081b9f1a5d (patch) | |
| tree | b3c7b4c734fcbdf11ad38785886652310b2772f2 /cmdline | |
| parent | d6e9ec719e2824db0b90f344f71b6e853df05627 (diff) | |
add the gpg-classic variant to the gpgv/gnupg or-group
We need to support partial upgrades anyhow, so we have to deal with the
different versions and your tests try to ensure that we do, so we
shouldn't make any explicit higher requirements.
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-key.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 0f9118492..aff75c300 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -530,9 +530,11 @@ EOF GPG_EXE="gpg" elif command_available 'gpg2'; then GPG_EXE="gpg2" + elif command_available 'gpg1'; then + GPG_EXE="gpg1" else - echo >&2 "Error: gnupg or gnupg2 do not seem to be installed," - echo >&2 "Error: but apt-key requires gnupg or gnupg2 for this operation." + echo >&2 "Error: gnupg, gnupg2 and gnupg1 do not seem to be installed," + echo >&2 "Error: but apt-key requires gnupg, gnupg2 or gnupg1 for this operation." echo >&2 exit 255 fi @@ -639,8 +641,9 @@ case "$command" in if [ -n "$GPGV" ] && command_available "$GPGV"; then true; elif command_available 'gpgv'; then GPGV='gpgv'; elif command_available 'gpgv2'; then GPGV='gpgv2'; + elif command_available 'gpgv1'; then GPGV='gpgv1'; else - echo >&2 'ERROR: gpgv or gpgv2 required for verification' + echo >&2 'ERROR: gpgv, gpgv2 or gpgv1 required for verification' exit 29 fi # for a forced keyid we need gpg --export, so full wrapping required |