diff options
author | Michael Vogt <mvo@debian.org> | 2006-01-18 23:14:34 +0000 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2006-01-18 23:14:34 +0000 |
commit | 011d9176844e1817f1dc64cf61c375ab77646d0e (patch) | |
tree | 5739bcf32d2c7bee58bc235f97c894bc157c501f /cmdline | |
parent | ac2c9fa03c9786da44320d59b3ad66f474c4634a (diff) | |
parent | 9f168dd5006886ad8725339322a61c1c9a907f32 (diff) |
* merged with apt--mvo
Patches applied:
* bubulle@debian.org--2005/apt--main--0--patch-160
Italian translation update
* bubulle@debian.org--2005/apt--main--0--patch-161
Galician translation completed
* bubulle@debian.org--2005/apt--main--0--patch-162
Spanish translation update
* bubulle@debian.org--2005/apt--main--0--patch-163
Two strings corrected in the British translation
* bubulle@debian.org--2005/apt--main--0--patch-164
Danish translation update
* bubulle@debian.org--2005/apt--main--0--patch-165
Completed Greek translation
* bubulle@debian.org--2005/apt--main--0--patch-166
Fix some permissions
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120
* added debian-archive-keyring to recommends
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-121
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-122
* fix apt-key to ask for the correct package
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123
* fix typo in apt-cache.8 manpage
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124
* fixed another typo in doc/apt-secure.8.xml
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125
* merged the debian-sid changes back
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126
* fixed the changelog yet again
Diffstat (limited to 'cmdline')
-rwxr-xr-x | cmdline/apt-key | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index 0685e36f7..7460a24be 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -16,7 +16,7 @@ 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 debian-keyring package installed?" + echo >&2 "Is the debian-archive-keyring package installed?" exit 1 fi |