Browse Source

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;
debian/1.8.y
Otavio Salvador 17 years ago
parent
commit
a7a5b0d941
  1. 2
      apt-pkg/acquire-item.cc
  2. 2
      apt-pkg/deb/debindexfile.cc
  3. 6
      apt-pkg/deb/debmetaindex.cc

2
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, "", "")
{
}

2
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)
{
}
/*}}}*/

6
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;
}
};

Loading…
Cancel
Save