From: Julian Andres Klode <jak@debian.org>
Date: Tue, 23 Aug 2016 19:01:06 +0000 (+0200)
Subject: apt-key: Only use readlink -f for existing components
X-Git-Tag: 1.3_rc3~10^2~23
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/dd7758b9245275a31fde70218db9a531c5859c26

apt-key: Only use readlink -f for existing components

On FreeBSD, readlink -f requires the last component
to exist.
---

diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 81314c7f5..21df37ffd 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -306,7 +306,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
-    local PUBRING="$(readlink -f "${GPGHOMEDIR}/pubring.gpg")"
+    local PUBRING="$(readlink -f "${GPGHOMEDIR}")/pubring.gpg"
     # if a --keyring was given, just use this one
     if [ -n "$FORCED_KEYRING" ]; then
 	if [ -s "$FORCED_KEYRING" ]; then