diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-13 19:31:40 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-13 19:31:40 +0000 |
| commit | 4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81 (patch) | |
| tree | 8f4f0bd9208e7e7f514c0683f1f18583352f2b2e /cmdline | |
| parent | Releasing progress-linux version 2.9.4-0.0~progress7.99u1. (diff) | |
| download | apt-4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81.tar.xz apt-4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81.zip | |
Merging upstream version 2.9.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-key.in | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 0752272..8738094 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -811,18 +811,8 @@ case "$command" in exit 29 fi GPGV_ARGS="" - if [ "$ASSERT_PUBKEY_ALGO" ]; then - test="$(LC_ALL=C.UTF-8 "$GPGV" --assert-pubkey-algo 2>&1 || :)" - case "$test" in - *"missing argument"*) - GPGV_ARGS="--assert-pubkey-algo=$ASSERT_PUBKEY_ALGO" - ;; - *[Ii]"nvalid option"*"assert-pubkey-algo"*) - ;; - *) - apt_warn "Unknown response from gpgv to --assert-pubkey-algo check: $test" - ;; - esac + if [ "$ASSERT_PUBKEY_ALGO" ] && $GPGV --dump-options | grep -q -- --assert-pubkey-algo; then + GPGV_ARGS="--assert-pubkey-algo=$ASSERT_PUBKEY_ALGO" fi # for a forced keyid we need gpg --export, so full wrapping required if [ -n "$FORCED_KEYID" ]; then |