diff options
| author | Christian Perrier <bubulle@debian.org> | 2006-01-06 07:39:41 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2006-01-06 07:39:41 +0000 |
| commit | 65977264e88835bd9fded96156264b30d89a128d (patch) | |
| tree | 54d6cfdd83fdbc6232224665e43c074eeacd562b /methods/gpgv.cc | |
| parent | 991529429a7cebfb94c6cbb7530422a05c638824 (diff) | |
| parent | 4d165fe0b5974454f706d42e7bb9e8424fe7fe64 (diff) | |
Merge with Michael archive (Debian version)
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-107
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-108
* added "gl" to po/LINGUAS
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-109
* add " " in update-po
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-110
* make apt-get source smarter about not downloading the same sources twice
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-111
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-112
* 2006 ftp-archive signing key added
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-113
* be more clever about I-M-S hits for the Release file and gpg-failures with it, requeue it without i-m-s then
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-114
* merged with mvo
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-115
* string fix
* mvo@debian.org--2005/apt--debian-sid--0--base-0
tag of michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71
* mvo@debian.org--2005/apt--debian-sid--0--patch-1
* merged with apt--mvo--0
* mvo@debian.org--2005/apt--debian-sid--0--patch-2
* merged with apt--mvo
* mvo@debian.org--2005/apt--debian-sid--0--patch-3
* updated apt-all.pot
* mvo@debian.org--2005/apt--debian-sid--0--patch-4
* merged with apt--mvo
* mvo@debian.org--2005/apt--debian-sid--0--patch-5
* merge with apt--mvo--0
* mvo@debian.org--2005/apt--debian-sid--0--patch-6
* merge with apt--mvo
* mvo@debian.org--2005/apt--debian-sid--0--patch-7
* applied patch from Petr Vandrovec to fix http download corruption
* mvo@debian.org--2005/apt--debian-sid--0--patch-8
* merged with apt--mvo, regenerated the po files
* mvo@debian.org--2005/apt--debian-sid--0--patch-9
* merged with apt--mvo
* mvo@debian.org--2005/apt--debian-sid--0--patch-10
* merged with apt--mvo and corrected conflicts in po/
* mvo@debian.org--2005/apt--debian-sid--0--patch-11
* changelog updates
* mvo@debian.org--2005/apt--debian-sid--0--patch-12
* apt--mvo merged
* mvo@debian.org--2005/apt--debian-sid--0--patch-13
* merged with mvo
* mvo@debian.org--2005/apt--debian-sid--0--patch-14
* merged with apt--mvo--0
* mvo@debian.org--2005/apt--debian-sid--0--patch-15
* support multiple signatures
* mvo@debian.org--2005/apt--debian-sid--0--patch-16
* merged with main
Diffstat (limited to 'methods/gpgv.cc')
| -rw-r--r-- | methods/gpgv.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 5cb154f66..a114ad797 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -247,7 +247,11 @@ bool GPGVMethod::Fetch(FetchItem *Itm) errmsg += (*I + "\n"); } } - return _error->Error(errmsg.c_str()); + // this is only fatal if we have no good sigs or if we have at + // least one bad signature. good signatures and NoPubKey signatures + // happen easily when a file is signed with multiple signatures + if(GoodSigners.empty() or !BadSigners.empty()) + return _error->Error(errmsg.c_str()); } // Transfer the modification times |