diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-03-28 19:24:48 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-03-28 19:24:48 +0200 |
| commit | 4f00fb2f265f5230c7d138b52854c0886092c0ab (patch) | |
| tree | ad11f6890d62d7292ba79c9471b4ed9feefd1fed /cmdline | |
| parent | 7e5f33eb8a0f224b938f17236f684ba5cadb9c7f (diff) | |
| parent | ad97ee36860c237427dc38ac8ef7f537ac275d77 (diff) | |
* merged from main
Diffstat (limited to 'cmdline')
| -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 be2b19a1a..7460a24be 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-archive-keyring package installed?" exit 1 fi |