show only the basename of the running test

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

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 74d136afbdadd422cdad26228c1d75ccec11db58..964c5bd8bc9ad486472ea3854947bac4fc809874 100644 (file)
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cachefile.cc,v 1.5 2001/02/20 07:03:17 jgg Exp $
+// $Id: cachefile.cc,v 1.8 2002/04/27 04:28:04 jgg Exp $

 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot
 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot


@@ -12,10 +12,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/cachefile.h"
-#endif
-

 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>


@@ -23,14 +19,16 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/pkgsystem.h>

+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/fileutl.h>

     
 #include <apti18n.h>
                                                                        /*}}}*/
     
 #include <apti18n.h>
                                                                        /*}}}*/

-

 // CacheFile::CacheFile - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CacheFile::CacheFile - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgCacheFile::pkgCacheFile() : Map(0), Cache(0), DCache(0), Policy(0)
+pkgCacheFile::pkgCacheFile() : Map(NULL), Cache(NULL), DCache(NULL),
+                               SrcList(NULL), Policy(NULL)

 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/


@@ -41,63 +39,130 @@ pkgCacheFile::~pkgCacheFile()
 {
    delete DCache;
    delete Policy;
 {
    delete DCache;
    delete Policy;

+   delete SrcList;

    delete Cache;
    delete Map;
    _system->UnLock(true);
    delete Cache;
    delete Map;
    _system->UnLock(true);

-}   
+}

                                                                        /*}}}*/
                                                                        /*}}}*/

-// CacheFile::Open - Open the cache files, creating if necessary       /*{{{*/
+// CacheFile::BuildCaches - Open and build the cache files             /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
+bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock)

 {
 {

+   if (Cache != NULL)
+      return true;
+
+   if (_config->FindB("pkgCacheFile::Generate", true) == false)
+   {
+      Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"),
+                    FileFd::ReadOnly),MMap::Public|MMap::ReadOnly);
+      Cache = new pkgCache(Map);
+      if (_error->PendingError() == true)
+         return false;
+      return true;
+   }
+
+   const bool ErrorWasEmpty = _error->empty();

    if (WithLock == true)
       if (_system->Lock() == false)
         return false;
    
    if (WithLock == true)
       if (_system->Lock() == false)
         return false;
    

+   if (_config->FindB("Debug::NoLocking",false) == true)
+      WithLock = false;
+      

    if (_error->PendingError() == true)
       return false;
    if (_error->PendingError() == true)
       return false;

-   
-   // Read the source list
-   pkgSourceList List;
-   if (List.ReadMainList() == false)
-      return _error->Error(_("The list of sources could not be read."));
+
+   BuildSourceList(Progress);

 
    // Read the caches
 
    // Read the caches

-   bool Res = pkgMakeStatusCache(List,Progress,&Map,!WithLock);
-   Progress.Done();
+   bool Res = pkgCacheGenerator::MakeStatusCache(*SrcList,Progress,&Map,!WithLock);
+   if (Progress != NULL)
+      Progress->Done();

    if (Res == false)
       return _error->Error(_("The package lists or status file could not be parsed or opened."));
 
    /* This sux, remove it someday */
    if (Res == false)
       return _error->Error(_("The package lists or status file could not be parsed or opened."));
 
    /* This sux, remove it someday */

-   if (_error->empty() == false)
-      _error->Warning(_("You may want to run apt-get update to correct these missing files"));
+   if (ErrorWasEmpty == true && _error->empty() == false)
+      _error->Warning(_("You may want to run apt-get update to correct these problems"));

 
    Cache = new pkgCache(Map);
    if (_error->PendingError() == true)
       return false;
 
    Cache = new pkgCache(Map);
    if (_error->PendingError() == true)
       return false;

-   
-   // The policy engine
+   return true;
+}
+                                                                       /*}}}*/
+// CacheFile::BuildSourceList - Open and build all relevant sources.list/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgCacheFile::BuildSourceList(OpProgress *Progress)
+{
+   if (SrcList != NULL)
+      return true;
+
+   SrcList = new pkgSourceList();
+   if (SrcList->ReadMainList() == false)
+      return _error->Error(_("The list of sources could not be read."));
+   return true;
+}
+                                                                       /*}}}*/
+// CacheFile::BuildPolicy - Open and build all relevant preferences    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgCacheFile::BuildPolicy(OpProgress *Progress)
+{
+   if (Policy != NULL)
+      return true;
+

    Policy = new pkgPolicy(Cache);
    if (_error->PendingError() == true)
       return false;
    Policy = new pkgPolicy(Cache);
    if (_error->PendingError() == true)
       return false;

-   if (ReadPinFile(*Policy) == false)
+
+   if (ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false)

       return false;
       return false;

-   
-   // Create the dependency cache
+
+   return true;
+}
+                                                                       /*}}}*/
+// CacheFile::BuildDepCache - Open and build the dependency cache      /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgCacheFile::BuildDepCache(OpProgress *Progress)
+{
+   if (DCache != NULL)
+      return true;
+

    DCache = new pkgDepCache(Cache,Policy);
    if (_error->PendingError() == true)
       return false;
    DCache = new pkgDepCache(Cache,Policy);
    if (_error->PendingError() == true)
       return false;

-   
-   DCache->Init(&Progress);
-   Progress.Done();
+
+   DCache->Init(Progress);
+   return true;
+}
+                                                                       /*}}}*/
+// CacheFile::Open - Open the cache files, creating if necessary       /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgCacheFile::Open(OpProgress *Progress, bool WithLock)
+{
+   if (BuildCaches(Progress,WithLock) == false)
+      return false;
+
+   if (BuildPolicy(Progress) == false)
+      return false;
+
+   if (BuildDepCache(Progress) == false)
+      return false;
+
+   if (Progress != NULL)
+      Progress->Done();

    if (_error->PendingError() == true)
       return false;
    
    return true;
 }
                                                                        /*}}}*/
    if (_error->PendingError() == true)
       return false;
    
    return true;
 }
                                                                        /*}}}*/

-

 // CacheFile::Close - close the cache files                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CacheFile::Close - close the cache files                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -106,12 +171,14 @@ void pkgCacheFile::Close()
    delete DCache;
    delete Policy;
    delete Cache;
    delete DCache;
    delete Policy;
    delete Cache;

+   delete SrcList;

    delete Map;
    _system->UnLock(true);
 
    delete Map;
    _system->UnLock(true);
 

-   Map = 0;
-   DCache = 0;
-   Policy = 0;
-   Cache = 0;
+   Map = NULL;
+   DCache = NULL;
+   Policy = NULL;
+   Cache = NULL;
+   SrcList = NULL;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/