* huge merge to bring the apt debian-sid and ubuntu branches as close

[apt.git] / apt-pkg / pkgcachegen.cc

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 3c02310a3d5bc64c95449aa03561caf9f462c2db..8ec6a171975ce1a28e7eee26beadbcc1a32adf38 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -26,6 +26,8 @@
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
 
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
 

+#include <apt-pkg/tagfile.h>
+

 #include <apti18n.h>
 
 #include <vector>
 #include <apti18n.h>
 
 #include <vector>


@@ -114,7 +116,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       
       pkgCache::PkgIterator Pkg;
       if (NewPackage(Pkg,PackageName) == false)
       
       pkgCache::PkgIterator Pkg;
       if (NewPackage(Pkg,PackageName) == false)

-        return _error->Error(_("Error occured while processing %s (NewPackage)"),PackageName.c_str());
+        return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str());

       Counter++;
       if (Counter % 100 == 0 && Progress != 0)
         Progress->Progress(List.Offset());
       Counter++;
       if (Counter % 100 == 0 && Progress != 0)
         Progress->Progress(List.Offset());


@@ -125,16 +127,46 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       string Version = List.Version();
       if (Version.empty() == true)
       {
       string Version = List.Version();
       if (Version.empty() == true)
       {

+        // we first process the package, then the descriptions
+        // (this has the bonus that we get MMap error when we run out
+        //  of MMap space)

         if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false)
         if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false)

-           return _error->Error(_("Error occured while processing %s (UsePackage1)"),
+           return _error->Error(_("Error occurred while processing %s (UsePackage1)"),

                                 PackageName.c_str());
                                 PackageName.c_str());

+
+        // Find the right version to write the description
+        MD5SumValue CurMd5 = List.Description_md5();
+        pkgCache::VerIterator Ver = Pkg.VersionList();
+        map_ptrloc *LastVer = &Pkg->VersionList;
+
+        for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) 
+        {
+           pkgCache::DescIterator Desc = Ver.DescriptionList();
+           map_ptrloc *LastDesc = &Ver->DescriptionList;
+
+           for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++)
+           {
+
+              if (MD5SumValue(Desc.md5()) == CurMd5) 
+               {
+                 // Add new description
+                 *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc);
+                 Desc->ParentPkg = Pkg.Index();
+                 
+                 if (NewFileDesc(Desc,List) == false)
+                    return _error->Error(_("Error occured while processing %s (NewFileDesc1)"),PackageName.c_str());
+                 break;
+              }
+           }
+        }
+

         continue;
       }
 
       pkgCache::VerIterator Ver = Pkg.VersionList();
         continue;
       }
 
       pkgCache::VerIterator Ver = Pkg.VersionList();

-      map_ptrloc *Last = &Pkg->VersionList;
+      map_ptrloc *LastVer = &Pkg->VersionList;

       int Res = 1;
       int Res = 1;

-      for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
+      for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)

       {
         Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
         if (Res >= 0)
       {
         Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
         if (Res >= 0)


@@ -147,11 +179,11 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       if (Res == 0 && Ver->Hash == Hash)
       {
         if (List.UsePackage(Pkg,Ver) == false)
       if (Res == 0 && Ver->Hash == Hash)
       {
         if (List.UsePackage(Pkg,Ver) == false)

-           return _error->Error(_("Error occured while processing %s (UsePackage2)"),
+           return _error->Error(_("Error occurred while processing %s (UsePackage2)"),

                                 PackageName.c_str());
 
         if (NewFileVer(Ver,List) == false)
                                 PackageName.c_str());
 
         if (NewFileVer(Ver,List) == false)

-           return _error->Error(_("Error occured while processing %s (NewFileVer1)"),
+           return _error->Error(_("Error occurred while processing %s (NewFileVer1)"),

                                 PackageName.c_str());
         
         // Read only a single record and return
                                 PackageName.c_str());
         
         // Read only a single record and return


@@ -168,7 +200,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       // Skip to the end of the same version set.
       if (Res == 0)
       {
       // Skip to the end of the same version set.
       if (Res == 0)
       {

-        for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
+        for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)

         {
            Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
            if (Res != 0)
         {
            Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
            if (Res != 0)


@@ -177,19 +209,20 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       }
 
       // Add a new version
       }
 
       // Add a new version

-      *Last = NewVersion(Ver,Version,*Last);
+      *LastVer = NewVersion(Ver,Version,*LastVer);

       Ver->ParentPkg = Pkg.Index();
       Ver->Hash = Hash;
       Ver->ParentPkg = Pkg.Index();
       Ver->Hash = Hash;

+

       if (List.NewVersion(Ver) == false)
       if (List.NewVersion(Ver) == false)

-        return _error->Error(_("Error occured while processing %s (NewVersion1)"),
+        return _error->Error(_("Error occurred while processing %s (NewVersion1)"),

                              PackageName.c_str());
 
       if (List.UsePackage(Pkg,Ver) == false)
                              PackageName.c_str());
 
       if (List.UsePackage(Pkg,Ver) == false)

-        return _error->Error(_("Error occured while processing %s (UsePackage3)"),
+        return _error->Error(_("Error occurred while processing %s (UsePackage3)"),

                              PackageName.c_str());
       
       if (NewFileVer(Ver,List) == false)
                              PackageName.c_str());
       
       if (NewFileVer(Ver,List) == false)

-        return _error->Error(_("Error occured while processing %s (NewVersion2)"),
+        return _error->Error(_("Error occurred while processing %s (NewVersion2)"),

                              PackageName.c_str());
 
       // Read only a single record and return
                              PackageName.c_str());
 
       // Read only a single record and return


@@ -199,6 +232,21 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
         FoundFileDeps |= List.HasFileDeps();
         return true;
       }      
         FoundFileDeps |= List.HasFileDeps();
         return true;
       }      

+
+      /* Record the Description data. Description data always exist in
+        Packages and Translation-* files. */
+      pkgCache::DescIterator Desc = Ver.DescriptionList();
+      map_ptrloc *LastDesc = &Ver->DescriptionList;
+      
+      // Skip to the end of description set
+      for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++);
+
+      // Add new description
+      *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc);
+      Desc->ParentPkg = Pkg.Index();
+
+      if (NewFileDesc(Desc,List) == false)
+        return _error->Error(_("Error occured while processing %s (NewFileDesc2)"),PackageName.c_str());

    }
 
    FoundFileDeps |= List.HasFileDeps();
    }
 
    FoundFileDeps |= List.HasFileDeps();


@@ -209,6 +257,9 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
    if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1)
       return _error->Error(_("Wow, you exceeded the number of versions "
                             "this APT is capable of."));
    if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1)
       return _error->Error(_("Wow, you exceeded the number of versions "
                             "this APT is capable of."));

+   if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1)
+      return _error->Error(_("Wow, you exceeded the number of descriptions "
+                            "this APT is capable of."));

    if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL)
       return _error->Error(_("Wow, you exceeded the number of dependencies "
                             "this APT is capable of."));
    if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL)
       return _error->Error(_("Wow, you exceeded the number of dependencies "
                             "this APT is capable of."));


@@ -238,7 +289,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
       
       pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
       if (Pkg.end() == true)
       
       pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
       if (Pkg.end() == true)

-        return _error->Error(_("Error occured while processing %s (FindPkg)"),
+        return _error->Error(_("Error occurred while processing %s (FindPkg)"),

                                PackageName.c_str());
       Counter++;
       if (Counter % 100 == 0 && Progress != 0)
                                PackageName.c_str());
       Counter++;
       if (Counter % 100 == 0 && Progress != 0)


@@ -251,7 +302,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
         if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr())
         {
            if (List.CollectFileProvides(Cache,Ver) == false)
         if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr())
         {
            if (List.CollectFileProvides(Cache,Ver) == false)

-              return _error->Error(_("Error occured while processing %s (CollectFileProvides)"),PackageName.c_str());
+              return _error->Error(_("Error occurred while processing %s (CollectFileProvides)"),PackageName.c_str());

            break;
         }
       }
            break;
         }
       }


@@ -266,12 +317,12 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
 // CacheGenerator::NewPackage - Add a new package                      /*{{{*/
 // ---------------------------------------------------------------------
 /* This creates a new package structure and adds it to the hash table */
 // CacheGenerator::NewPackage - Add a new package                      /*{{{*/
 // ---------------------------------------------------------------------
 /* This creates a new package structure and adds it to the hash table */

-bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,string Name)
+bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name)

 {
    Pkg = Cache.FindPkg(Name);
    if (Pkg.end() == false)
       return true;
 {
    Pkg = Cache.FindPkg(Name);
    if (Pkg.end() == false)
       return true;

-       
+

    // Get a structure
    unsigned long Package = Map.Allocate(sizeof(pkgCache::Package));
    if (Package == 0)
    // Get a structure
    unsigned long Package = Map.Allocate(sizeof(pkgCache::Package));
    if (Package == 0)


@@ -330,7 +381,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
 // ---------------------------------------------------------------------
 /* This puts a version structure in the linked list */
 unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
 // ---------------------------------------------------------------------
 /* This puts a version structure in the linked list */
 unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,

-                                           string VerStr,
+                                           const string &VerStr,

                                            unsigned long Next)
 {
    // Get a structure
                                            unsigned long Next)
 {
    // Get a structure


@@ -349,13 +400,69 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
    return Version;
 }
                                                                        /*}}}*/
    return Version;
 }
                                                                        /*}}}*/

+// CacheGenerator::NewFileDesc - Create a new File<->Desc association  /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
+                                  ListParser &List)
+{
+   if (CurrentFile == 0)
+      return true;
+   
+   // Get a structure
+   unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile));
+   if (DescFile == 0)
+      return 0;
+
+   pkgCache::DescFileIterator DF(Cache,Cache.DescFileP + DescFile);
+   DF->File = CurrentFile - Cache.PkgFileP;
+
+   // Link it to the end of the list
+   map_ptrloc *Last = &Desc->FileList;
+   for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; D++)
+      Last = &D->NextFile;
+
+   DF->NextFile = *Last;
+   *Last = DF.Index();
+   
+   DF->Offset = List.Offset();
+   DF->Size = List.Size();
+   if (Cache.HeaderP->MaxDescFileSize < DF->Size)
+      Cache.HeaderP->MaxDescFileSize = DF->Size;
+   Cache.HeaderP->DescFileCount++;
+   
+   return true;
+}
+                                                                       /*}}}*/
+// CacheGenerator::NewDescription - Create a new Description           /*{{{*/
+// ---------------------------------------------------------------------
+/* This puts a description structure in the linked list */
+map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
+                                           const string &Lang, const MD5SumValue &md5sum,
+                                           map_ptrloc Next)
+{
+   // Get a structure
+   map_ptrloc Description = Map.Allocate(sizeof(pkgCache::Description));
+   if (Description == 0)
+      return 0;
+
+   // Fill it in
+   Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description);
+   Desc->NextDesc = Next;
+   Desc->ID = Cache.HeaderP->DescriptionCount++;
+   Desc->language_code = Map.WriteString(Lang);
+   Desc->md5sum = Map.WriteString(md5sum.Value());
+
+   return Description;
+}
+                                                                       /*}}}*/

 // ListParser::NewDepends - Create a dependency element                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This creates a dependency element in the tree. It is linked to the
    version and to the package that it is pointing to. */
 bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
 // ListParser::NewDepends - Create a dependency element                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This creates a dependency element in the tree. It is linked to the
    version and to the package that it is pointing to. */
 bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,

-                                              string PackageName,
-                                              string Version,
+                                              const string &PackageName,
+                                              const string &Version,

                                               unsigned int Op,
                                               unsigned int Type)
 {
                                               unsigned int Op,
                                               unsigned int Type)
 {


@@ -419,8 +526,8 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
 // ---------------------------------------------------------------------
 /* */
 bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
 // ---------------------------------------------------------------------
 /* */
 bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,

-                                               string PackageName,
-                                               string Version)
+                                               const string &PackageName,
+                                               const string &Version)

 {
    pkgCache &Cache = Owner->Cache;
 
 {
    pkgCache &Cache = Owner->Cache;
 


@@ -459,7 +566,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
 // ---------------------------------------------------------------------
 /* This is used to select which file is to be associated with all newly
    added versions. The caller is responsible for setting the IMS fields. */
 // ---------------------------------------------------------------------
 /* This is used to select which file is to be associated with all newly
    added versions. The caller is responsible for setting the IMS fields. */

-bool pkgCacheGenerator::SelectFile(string File,string Site,
+bool pkgCacheGenerator::SelectFile(const string &File,const string &Site,

                                   const pkgIndexFile &Index,
                                   unsigned long Flags)
 {
                                   const pkgIndexFile &Index,
                                   unsigned long Flags)
 {


@@ -543,7 +650,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
 /* This just verifies that each file in the list of index files exists,
    has matching attributes with the cache and the cache does not have
    any extra files. */
 /* This just verifies that each file in the list of index files exists,
    has matching attributes with the cache and the cache does not have
    any extra files. */

-static bool CheckValidity(string CacheFile, FileIterator Start, 
+static bool CheckValidity(const string &CacheFile, FileIterator Start, 

                           FileIterator End,MMap **OutMap = 0)
 {
    // No file, certainly invalid
                           FileIterator End,MMap **OutMap = 0)
 {
    // No file, certainly invalid


@@ -571,8 +678,10 @@ static bool CheckValidity(string CacheFile, FileIterator Start,
     
       if ((*Start)->Exists() == false)
       {
     
       if ((*Start)->Exists() == false)
       {

+#if 0 // mvo: we no longer give a message here (Default Sources spec)

         _error->WarningE("stat",_("Couldn't stat source package list %s"),
                          (*Start)->Describe().c_str());
         _error->WarningE("stat",_("Couldn't stat source package list %s"),
                          (*Start)->Describe().c_str());

+#endif

         continue;
       }
 
         continue;
       }
 


@@ -580,7 +689,7 @@ static bool CheckValidity(string CacheFile, FileIterator Start,
       pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache);
       if (File.end() == true)
         return false;
       pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache);
       if (File.end() == true)
         return false;

-      
+

       Visited[File->ID] = true;
    }
    
       Visited[File->ID] = true;
    }
    


@@ -640,7 +749,7 @@ static bool BuildCache(pkgCacheGenerator &Gen,
       }
       
       unsigned long Size = (*I)->Size();
       }
       
       unsigned long Size = (*I)->Size();

-      Progress.OverallProgress(CurrentSize,TotalSize,Size,_("Reading Package Lists"));
+      Progress.OverallProgress(CurrentSize,TotalSize,Size,_("Reading package lists"));

       CurrentSize += Size;
       
       if ((*I)->Merge(Gen,Progress) == false)
       CurrentSize += Size;
       
       if ((*I)->Merge(Gen,Progress) == false)


@@ -676,7 +785,7 @@ static bool BuildCache(pkgCacheGenerator &Gen,
 bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
                        MMap **OutMap,bool AllowMem)
 {
 bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
                        MMap **OutMap,bool AllowMem)
 {

-   unsigned long MapSize = _config->FindI("APT::Cache-Limit",12*1024*1024);
+   unsigned long MapSize = _config->FindI("APT::Cache-Limit",16*1024*1024);

    
    vector<pkgIndexFile *> Files;
    for (vector<metaIndex *>::const_iterator i = List.begin();
    
    vector<pkgIndexFile *> Files;
    for (vector<metaIndex *>::const_iterator i = List.begin();


@@ -709,12 +818,12 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
    if (Writeable == false && AllowMem == false && CacheFile.empty() == false)
       return _error->Error(_("Unable to write to %s"),flNotFile(CacheFile).c_str());
    
    if (Writeable == false && AllowMem == false && CacheFile.empty() == false)
       return _error->Error(_("Unable to write to %s"),flNotFile(CacheFile).c_str());
    

-   Progress.OverallProgress(0,1,1,_("Reading Package Lists"));
+   Progress.OverallProgress(0,1,1,_("Reading package lists"));

    
    // Cache is OK, Fin.
    if (CheckValidity(CacheFile,Files.begin(),Files.end(),OutMap) == true)
    {
    
    // Cache is OK, Fin.
    if (CheckValidity(CacheFile,Files.begin(),Files.end(),OutMap) == true)
    {

-      Progress.OverallProgress(1,1,1,_("Reading Package Lists"));
+      Progress.OverallProgress(1,1,1,_("Reading package lists"));

       return true;
    }
    
       return true;
    }
    


@@ -823,7 +932,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
 /* */
 bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
 {
 /* */
 bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
 {

-   unsigned long MapSize = _config->FindI("APT::Cache-Limit",8*1024*1024);
+   unsigned long MapSize = _config->FindI("APT::Cache-Limit",12*1024*1024);

    vector<pkgIndexFile *> Files;
    unsigned long EndOfSource = Files.size();
    if (_system->AddStatusFiles(Files) == false)
    vector<pkgIndexFile *> Files;
    unsigned long EndOfSource = Files.size();
    if (_system->AddStatusFiles(Files) == false)


@@ -837,7 +946,7 @@ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
    TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
    
    // Build the status cache
    TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
    
    // Build the status cache

-   Progress.OverallProgress(0,1,1,_("Reading Package Lists"));
+   Progress.OverallProgress(0,1,1,_("Reading package lists"));

    pkgCacheGenerator Gen(Map.Get(),&Progress);
    if (_error->PendingError() == true)
       return false;
    pkgCacheGenerator Gen(Map.Get(),&Progress);
    if (_error->PendingError() == true)
       return false;