summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2014-02-02 17:16:44 +0400
committerIgor Pashev <pashev.igor@gmail.com>2014-02-02 17:16:44 +0400
commita12b899642fa44f837cbed7021800e0ab01bb3c2 (patch)
treeec6bee7f9dc8c1bc952b52e5be0a5b9fad650a15 /cmdline
parent32332ddaa6a8066f9633ed9ecedf4b7cecc9ba9c (diff)
downloadapt-a12b899642fa44f837cbed7021800e0ab01bb3c2.tar.gz
Build cmdline/apt-key
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-key.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 0ced500d..cf644008 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -29,13 +29,13 @@ GPG="$GPG_CMD"
APT_DIR="/"
eval $(apt-config shell APT_DIR Dir)
-MASTER_KEYRING='&keyring-master-filename;'
+MASTER_KEYRING='@KEYRING_MASTER_FILENAME@'
eval $(apt-config shell MASTER_KEYRING APT::Key::MasterKeyring)
-ARCHIVE_KEYRING='&keyring-filename;'
+ARCHIVE_KEYRING='@KEYRING_FILENAME@'
eval $(apt-config shell ARCHIVE_KEYRING APT::Key::ArchiveKeyring)
-REMOVED_KEYS='&keyring-removed-filename;'
+REMOVED_KEYS='@KEYRING_REMOVED_FILENAME@'
eval $(apt-config shell REMOVED_KEYS APT::Key::RemovedKeys)
-ARCHIVE_KEYRING_URI='&keyring-uri;'
+ARCHIVE_KEYRING_URI='@KEYRING_URI@'
eval $(apt-config shell ARCHIVE_KEYRING_URI APT::Key::ArchiveKeyringURI)
TMP_KEYRING=${APT_DIR}/var/lib/apt/keyrings/maybe-import-keyring.gpg