diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-06-26 21:28:56 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-06-26 21:28:56 +0000 |
| commit | 99f9dc4c97a7eef6b2819c933be0fc947f747912 (patch) | |
| tree | 87c2d6538a50e74cfece87ff2bf5a78b5486e24f /cmdline | |
| parent | 602afa46935a1015ae9d07a016b4b4cc199205a2 (diff) | |
Merge with mainline
Patches applied:
* andrelop@debian.org/apt--translation--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* andrelop@debian.org/apt--translation--0--patch-1
Sync with Matt version.
* andrelop@debian.org/apt--translation--0--patch-2
Update pt_BR translation
* andrelop@debian.org/apt--translation--0--patch-3
Sync with bubulle's branch.
* apt@packages.debian.org/apt--main--0--patch-94
Update changelog
* apt@packages.debian.org/apt--main--0--patch-95
Merge Christian's branch
* apt@packages.debian.org/apt--main--0--patch-96
Update changelog
* apt@packages.debian.org/apt--main--0--patch-97
Update priority of apt-utils to important, to match the override file
* bubulle@debian.org--2005/apt--main--0--patch-82
Fix permissions
* bubulle@debian.org--2005/apt--main--0--patch-83
French translation spellchecked
* bubulle@debian.org--2005/apt--main--0--patch-84
Spell corrections in German translations
* bubulle@debian.org--2005/apt--main--0--patch-85
Correct some file permissions
* bubulle@debian.org--2005/apt--main--0--patch-86
Correct Hebrew translation
* bubulle@debian.org--2005/apt--main--0--patch-87
Sync Portuguese translation with the POT file
* bubulle@debian.org--2005/apt--main--0--patch-88
Updated Danish translation (not yet complete)
* bubulle@debian.org--2005/apt--main--0--patch-89
Sync with Andre Luis Lopes and Otavio branches
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..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 |