diff options
author | Otavio Salvador <otavio@debian.org> | 2005-03-23 22:38:53 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@debian.org> | 2005-03-23 22:38:53 +0000 |
commit | a7a5b0d941a8e56a1be2822226a5a81cd94d6ea6 (patch) | |
tree | a595c37733dbf60a9ba61e4e63ea0414f5716830 | |
parent | d9f5f2883b9b4f3487ec98a626571bd83329d862 (diff) |
Fix problems due APT and structural changes.
- apt-pkg/acquire-item.cc: pass the expected md5 and compressed
extenssion as empty in pkgAcqIndexTrans::pkgAcqIndexTrans(...)
constructor;
- apt-pkg/deb/debindexfile.cc: identify translation files as trusted;
- apt-pkg/deb/debmetaindex.cc: change the way it's queue the
translation file due a change in APT structure did in 0.6 branch;
-rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
-rw-r--r-- | apt-pkg/deb/debindexfile.cc | 2 | ||||
-rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index d9a6a554c..3df9f2407 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -312,7 +312,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5, /* The Translation file is added to the queue */ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc) : - pkgAcqIndex(Owner, URI, URIDesc, ShortDesc) + pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, "", "") { } diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 1d8c1e8ec..4113137eb 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -324,7 +324,7 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const // --------------------------------------------------------------------- /* */ debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section) : - URI(URI), Dist(Dist), Section(Section) + pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section) { } /*}}}*/ diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index c7ae25256..7f15fd2e1 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -177,11 +177,14 @@ vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles() Indexes = new vector <pkgIndexFile*>; for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); I++) + I != SectionEntries.end(); I++) { if ((*I)->IsSrc) Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted())); else Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted())); + Indexes->push_back(new debTranslationsIndex(URI,Dist,(*I)->Section)); + } + return Indexes; } @@ -227,7 +230,6 @@ class debSLTypeDebian : public pkgSourceList::Type debReleaseIndex *Deb = new debReleaseIndex(URI,Dist); Deb->PushSectionEntry (new debReleaseIndex::debSectionEntry(Section, IsSrc)); List.push_back(Deb); - List.push_back(new debTranslationsIndex(URI,Dist,Section)); return true; } }; |