diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-03-28 21:26:24 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-03-28 21:26:24 +0200 |
commit | c6c31f6206dbb8900883d2547f6ff0657113a319 (patch) | |
tree | 39d77e1d8dc4cf333520a468aa07b2633f86c8b2 | |
parent | 29bbe08e95d7ab3c5910b7e588c7903de7921ca3 (diff) |
* fix the apt-key (merge problem?)
-rwxr-xr-x | cmdline/apt-key | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index 7460a24be..be2b19a1a 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/debian-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the debian-archive-keyring package installed?" + echo >&2 "Is the ubuntu-keyring package installed?" exit 1 fi |