diff options
| author | Christian Perrier <bubulle@debian.org> | 2006-01-20 12:51:36 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2006-01-20 12:51:36 +0000 |
| commit | dbe5505ecb4180bc3d850193aa2458bd04df1896 (patch) | |
| tree | 5739bcf32d2c7bee58bc235f97c894bc157c501f /cmdline | |
| parent | 9b7f38f18c97808022f15ce496479c94126bd169 (diff) | |
| parent | 011d9176844e1817f1dc64cf61c375ab77646d0e (diff) | |
Resync with Michael
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-116
* changelog updates
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-117
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-118
* merged from bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-119
* fix http data corruption (#280844)
* 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
* mvo@debian.org--2005/apt--debian-experimental--0--patch-12
* added http data corruption fix patch (#280844)
* mvo@debian.org--2005/apt--debian-sid--0--patch-17
* merged with apt--mvo--0
* mvo@debian.org--2005/apt--debian-sid--0--patch-18
* merged with apt--mvo
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 |