diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-06 00:13:21 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-06 00:13:21 +0000 |
| commit | 6e6ded608e8250c22cefe03c6f9214401cb6de7c (patch) | |
| tree | 9a7947bff875e32633b423c8d5a3448ef451e766 /methods/gpgv.cc | |
| parent | f381d68d3c1de8e96dfb2a2ebe36c8577729ec44 (diff) | |
| parent | ce424cd4464ce46706046d581e05fbf292a54881 (diff) | |
* merged with mvo
Patches applied:
* 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
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 |