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;

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d9a6a554c34b3c5b0b1792101cfcc21303b108f3..3df9f24073094b8d3a2a6837c85518a536d33662 100644 (file)
--- 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) :
 /* 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 1d8c1e8ecd757e207752678ed6611693ea9fdb67..4113137eb921c6da4f4d13dcb2bff51df3a184fe 100644 (file)
--- 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) : 
 // ---------------------------------------------------------------------
 /* */
 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 c7ae252561989c18ca2bc83cd6ef8cf3068a8b66..7f15fd2e1f17ea4ddd41d2b6cd135a2bf9c03390 100644 (file)
--- 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(); 
 
    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()));
       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;
 }
 
    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);
       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;
    }
 };
       return true;
    }
 };