Fixed quoting bug

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

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index bbf245b00e3e9ebedfa6505bce5125dffe9da6a9..7cf332b68da4ed4a192aed8f57dda3439ab0e34c 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: pkgcachegen.cc,v 1.23 1998/11/13 04:23:33 jgg Exp $
+// $Id: pkgcachegen.cc,v 1.26 1998/12/14 03:39:15 jgg Exp $
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
@@ -188,6 +188,8 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
    VF->Size = List.Size();
    if (Cache.HeaderP->MaxVerFileSize < VF->Size)
       Cache.HeaderP->MaxVerFileSize = VF->Size;
+   Cache.HeaderP->VerFileCount++;
+   
    return true;
 }
                                                                        /*}}}*/
@@ -253,19 +255,28 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
         if ((Dep->Version = WriteString(Version)) == 0)
            return false;
    }
-   
+      
    // Link it to the package
    Dep->Package = Pkg.Index();
    Dep->NextRevDepends = Pkg->RevDepends;
    Pkg->RevDepends = Dep.Index();
    
-   // Link it to the version (at the end of the list)
-   __apt_ptrloc *Last = &Ver->DependsList;
-   for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
-      Last = &D->NextDepends;
-   Dep->NextDepends = *Last;
-   *Last = Dep.Index();
+   /* Link it to the version (at the end of the list)
+      Caching the old end point speeds up generation substantially */
+   static pkgCache::VerIterator OldVer(Cache);
+   static __apt_ptrloc *OldLast;
+   if (OldVer != Ver)
+   {
+      OldLast = &Ver->DependsList;
+      for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
+        OldLast = &D->NextDepends;
+      OldVer = Ver;
+   }
    
+   Dep->NextDepends = *OldLast;
+   *OldLast = Dep.Index();
+   OldLast = &Dep->NextDepends;
+
    return true;
 }
                                                                        /*}}}*/
@@ -286,6 +297,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
    unsigned long Provides = Owner->Map.Allocate(sizeof(pkgCache::Provides));
    if (Provides == 0)
       return false;
+   Cache.HeaderP->ProvidesCount++;
    
    // Fill it in
    pkgCache::PrvIterator Prv(Cache,Cache.ProvideP + Provides,Cache.PkgP);
@@ -626,8 +638,8 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress)
       for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); I++)
       {
         string File = ListDir + URItoFileName(I->PackagesURI());
-
-        if (stat(File.c_str(),&Buf) != 0)
+        
+        if (FileExists(File) == false)
            continue;
         
         FileFd Pkg(File,FileFd::ReadOnly);
@@ -643,6 +655,16 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress)
         
         if (Gen.MergeList(Parser) == false)
            return _error->Error("Problem with MergeList %s",File.c_str());
+
+        // Check the release file
+        string RFile = ListDir + URItoFileName(I->ReleaseURI());
+        if (FileExists(RFile) == true)
+        {
+           FileFd Rel(RFile,FileFd::ReadOnly);
+           if (_error->PendingError() == true)
+              return false;
+           Parser.LoadReleaseInfo(Gen.GetCurFile(),Rel);
+        }
       }               
       
       // Write the src cache