diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-07-30 17:34:48 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-07-30 17:34:48 +0200 |
| commit | 55fb35e87a1ff550cbb3010c5a03064f0a2b10be (patch) | |
| tree | 6ecb92eb145eefbb0c4a6dc6a869d9e21ba10b55 /apt-pkg/indexcopy.cc | |
| parent | adbce12126ccc58016af69d541bafad5c8bde631 (diff) | |
| parent | d5752e18bed18c706c93f5c43c61016c72132ede (diff) | |
merged from debian
Diffstat (limited to 'apt-pkg/indexcopy.cc')
| -rw-r--r-- | apt-pkg/indexcopy.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index b1e75e30f..15696585a 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -551,8 +551,8 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex) return true; } - -bool SigVerify::CopyMetaIndex(string CDROM, string CDName, + /*}}}*/ +bool SigVerify::CopyMetaIndex(string CDROM, string CDName, /*{{{*/ string prefix, string file) { char S[400]; @@ -572,8 +572,8 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName, return true; } - -bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, + /*}}}*/ +bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, /*{{{*/ vector<string> PkgList,vector<string> SrcList) { if (SigList.size() == 0) @@ -660,6 +660,7 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, if(!Verify(prefix,*I, MetaIndex)) { // something went wrong, don't copy the Release.gpg // FIXME: delete any existing gpg file? + _error->Discard(); continue; } } @@ -674,10 +675,9 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, return true; } - - -bool TranslationsCopy::CopyTranslations(string CDROM,string Name,vector<string> &List, - pkgCdromStatus *log) + /*}}}*/ +bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ + vector<string> &List, pkgCdromStatus *log) { OpProgress *Progress = NULL; if (List.size() == 0) @@ -849,3 +849,4 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,vector<string> return true; } + /*}}}*/ |