don't perform implicit crossgrades involving M-A:same

[apt.git] / cmdline / apt-key.in

diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 199903d61165af2fce677695d39108abe48ef49f..0c10e59554972fc62603306daa7c4370e822096f 100644 (file)
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -321,7 +321,7 @@ merge_all_trusted_keyrings_into_pubring() {
     # does the same as:
     # foreach_keyring_do 'import_keys_from_keyring' "${GPGHOMEDIR}/pubring.gpg"
     # but without using gpg, just cat and find
     # does the same as:
     # foreach_keyring_do 'import_keys_from_keyring' "${GPGHOMEDIR}/pubring.gpg"
     # but without using gpg, just cat and find

-    local PUBRING="$(readlink -f "${GPGHOMEDIR}/pubring.gpg")"
+    local PUBRING="$(readlink -f "${GPGHOMEDIR}")/pubring.gpg"

     rm -f "$PUBRING"
     touch "$PUBRING"
     foreach_keyring_do 'catfile' "$PUBRING"
     rm -f "$PUBRING"
     touch "$PUBRING"
     foreach_keyring_do 'catfile' "$PUBRING"