Slightly tweaked problem resolver

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

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 567628ef5dbef6f6f3ffc94b80522990ae2b65b3..bbf245b00e3e9ebedfa6505bce5125dffe9da6a9 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcachegen.cc,v 1.18 1998/10/02 04:39:47 jgg Exp $
+// $Id: pkgcachegen.cc,v 1.23 1998/11/13 04:23:33 jgg Exp $

 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.


@@ -94,7 +94,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List)
       }
 
       pkgCache::VerIterator Ver = Pkg.VersionList();
       }
 
       pkgCache::VerIterator Ver = Pkg.VersionList();

-      unsigned long *Last = &Pkg->VersionList;
+      __apt_ptrloc *Last = &Pkg->VersionList;

       int Res = 1;
       for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
       {
       int Res = 1;
       for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
       {


@@ -176,8 +176,14 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
    
    pkgCache::VerFileIterator VF(Cache,Cache.VerFileP + VerFile);
    VF->File = CurrentFile - Cache.PkgFileP;
    
    pkgCache::VerFileIterator VF(Cache,Cache.VerFileP + VerFile);
    VF->File = CurrentFile - Cache.PkgFileP;

-   VF->NextFile = Ver->FileList;
-   Ver->FileList = VF.Index();
+   
+   // Link it to the end of the list
+   __apt_ptrloc *Last = &Ver->FileList;
+   for (pkgCache::VerFileIterator V = Ver.FileList(); V.end() == false; V++)
+      Last = &V->NextFile;
+   VF->NextFile = *Last;
+   *Last = VF.Index();
+   

    VF->Offset = List.Offset();
    VF->Size = List.Size();
    if (Cache.HeaderP->MaxVerFileSize < VF->Size)
    VF->Offset = List.Offset();
    VF->Size = List.Size();
    if (Cache.HeaderP->MaxVerFileSize < VF->Size)


@@ -254,7 +260,7 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
    Pkg->RevDepends = Dep.Index();
    
    // Link it to the version (at the end of the list)
    Pkg->RevDepends = Dep.Index();
    
    // Link it to the version (at the end of the list)

-   unsigned long *Last = &Ver->DependsList;
+   __apt_ptrloc *Last = &Ver->DependsList;

    for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
       Last = &D->NextDepends;
    Dep->NextDepends = *Last;
    for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
       Last = &D->NextDepends;
    Dep->NextDepends = *Last;


@@ -345,7 +351,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
    // Search for an insertion point
    pkgCache::StringItem *I = Cache.StringItemP + Cache.HeaderP->StringList;
    int Res = 1;
    // Search for an insertion point
    pkgCache::StringItem *I = Cache.StringItemP + Cache.HeaderP->StringList;
    int Res = 1;

-   unsigned long *Last = &Cache.HeaderP->StringList;
+   __apt_ptrloc *Last = &Cache.HeaderP->StringList;

    for (; I != Cache.StringItemP; Last = &I->NextItem, 
         I = Cache.StringItemP + I->NextItem)
    {
    for (; I != Cache.StringItemP; Last = &I->NextItem, 
         I = Cache.StringItemP + I->NextItem)
    {


@@ -384,7 +390,7 @@ bool pkgSrcCacheCheck(pkgSourceList &List)
    if (_error->PendingError() == true)
       return false;
 
    if (_error->PendingError() == true)
       return false;
 

-   string CacheFile = _config->FindDir("Dir::Cache::srcpkgcache");
+   string CacheFile = _config->FindFile("Dir::Cache::srcpkgcache");

    string ListDir = _config->FindDir("Dir::State::lists");
 
    // Count the number of missing files
    string ListDir = _config->FindDir("Dir::State::lists");
 
    // Count the number of missing files


@@ -487,10 +493,31 @@ bool pkgPkgCacheCheck(string CacheFile)
       return false;
    }
 
       return false;
    }
 

+   // Status files that must be in the cache
+   string Status[3];
+   Status[0] = _config->FindFile("Dir::State::xstatus");
+   Status[1]= _config->FindFile("Dir::State::userstatus");
+   Status[2] = _config->FindFile("Dir::State::status");
+   

    // Cheack each file
    for (pkgCache::PkgFileIterator F(Cache); F.end() == false; F++)
    // Cheack each file
    for (pkgCache::PkgFileIterator F(Cache); F.end() == false; F++)

+   {

       if (F.IsOk() == false)
         return false;
       if (F.IsOk() == false)
         return false;

+      
+      // See if this is one of the status files
+      for (int I = 0; I != 3; I++)
+        if (F.FileName() == Status[I])
+           Status[I] = string();
+   }
+   
+   // Make sure all the status files are loaded.
+   for (int I = 0; I != 3; I++)
+   {
+      if (Status[I].empty() == false && FileExists(Status[I]) == true)
+        return false;
+   }   
+   

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -500,9 +527,9 @@ bool pkgPkgCacheCheck(string CacheFile)
 static bool pkgAddSourcesSize(unsigned long &TotalSize)
 {
    // Grab the file names
 static bool pkgAddSourcesSize(unsigned long &TotalSize)
 {
    // Grab the file names

-   string xstatus = _config->FindDir("Dir::State::xstatus");
-   string userstatus = _config->FindDir("Dir::State::userstatus");
-   string status = _config->FindDir("Dir::State::status");
+   string xstatus = _config->FindFile("Dir::State::xstatus");
+   string userstatus = _config->FindFile("Dir::State::userstatus");
+   string status = _config->FindFile("Dir::State::status");

    
    // Grab the sizes
    struct stat Buf;
    
    // Grab the sizes
    struct stat Buf;


@@ -525,9 +552,9 @@ static bool pkgMergeStatus(OpProgress &Progress,pkgCacheGenerator &Gen,
 {
    // Grab the file names   
    string Status[3];
 {
    // Grab the file names   
    string Status[3];

-   Status[0] = _config->FindDir("Dir::State::xstatus");
-   Status[1]= _config->FindDir("Dir::State::userstatus");
-   Status[2] = _config->FindDir("Dir::State::status");
+   Status[0] = _config->FindFile("Dir::State::xstatus");
+   Status[1]= _config->FindFile("Dir::State::userstatus");
+   Status[2] = _config->FindFile("Dir::State::status");

    
    for (int I = 0; I != 3; I++)
    {
    
    for (int I = 0; I != 3; I++)
    {


@@ -563,16 +590,15 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress)
 {
    Progress.OverallProgress(0,1,1,"Reading Package Lists");
    
 {
    Progress.OverallProgress(0,1,1,"Reading Package Lists");
    

-   string CacheFile = _config->FindDir("Dir::Cache::pkgcache");
+   string CacheFile = _config->FindFile("Dir::Cache::pkgcache");

    bool SrcOk = pkgSrcCacheCheck(List);
    bool PkgOk = SrcOk && pkgPkgCacheCheck(CacheFile);
    
    // Rebuild the source and package caches   
    if (SrcOk == false)
    {      
    bool SrcOk = pkgSrcCacheCheck(List);
    bool PkgOk = SrcOk && pkgPkgCacheCheck(CacheFile);
    
    // Rebuild the source and package caches   
    if (SrcOk == false)
    {      

-      string SCacheFile = _config->FindDir("Dir::Cache::srcpkgcache");
+      string SCacheFile = _config->FindFile("Dir::Cache::srcpkgcache");

       string ListDir = _config->FindDir("Dir::State::lists");
       string ListDir = _config->FindDir("Dir::State::lists");

-      

       FileFd SCacheF(SCacheFile,FileFd::WriteEmpty);
       FileFd CacheF(CacheFile,FileFd::WriteEmpty);
       DynamicMMap Map(CacheF,MMap::Public);
       FileFd SCacheF(SCacheFile,FileFd::WriteEmpty);
       FileFd CacheF(CacheFile,FileFd::WriteEmpty);
       DynamicMMap Map(CacheF,MMap::Public);


@@ -636,7 +662,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress)
    }
    
    // We use the source cache to generate the package cache
    }
    
    // We use the source cache to generate the package cache

-   string SCacheFile = _config->FindDir("Dir::Cache::srcpkgcache");
+   string SCacheFile = _config->FindFile("Dir::Cache::srcpkgcache");

 
    FileFd SCacheF(SCacheFile,FileFd::ReadOnly);
    FileFd CacheF(CacheFile,FileFd::WriteEmpty);
 
    FileFd SCacheF(SCacheFile,FileFd::ReadOnly);
    FileFd CacheF(CacheFile,FileFd::WriteEmpty);