summaryrefslogtreecommitdiff
path: root/cmdline/apt-key
diff options
context:
space:
mode:
authorMatt Zimmerman <matt.zimmerman@canonical.com>2005-06-25 23:52:00 +0000
committerMatt Zimmerman <matt.zimmerman@canonical.com>2005-06-25 23:52:00 +0000
commitd9e050800067f16ba49cb6932d7a52a6de22ab9d (patch)
tree3510a15d3b4670bbf491fd2ff2f15a201696860b /cmdline/apt-key
parenta7aced0e4a28ebe7c81f475bbe102b74ff9f2772 (diff)
Merge from Debian branch
Patches applied: * apt@packages.debian.org/apt--main--0--patch-89 Branch for Debian * apt@packages.debian.org/apt--main--0--patch-90 Update version in configure * apt@packages.debian.org/apt--main--0--patch-91 Fix French man page build * apt@packages.debian.org/apt--main--0--patch-92 Add the current Debian archive signing key * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6 * build fix for apt--main--0
Diffstat (limited to 'cmdline/apt-key')
-rwxr-xr-xcmdline/apt-key6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index be2b19a1a..0685e36f7 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring
GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
-ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the ubuntu-keyring package installed?"
+ echo >&2 "Is the debian-keyring package installed?"
exit 1
fi