merged r1811 from lp:~donkult/apt/experimenal

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

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index d7f3c09370c98fa94c7f4fdd32d48cb060c53460..1a84aea54d5504ed2c0ceb126c2e64f68104290a 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.4 1999/06/24 04:06:30 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,80 +12,95 @@
    ##################################################################### */
                                                                        /*}}}*/
 // 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/pkgcachegen.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/pkgcachegen.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>

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

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

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

-// CacheFile::~CacheFile - Destructor                                          /*{{{*/
+// CacheFile::~CacheFile - Destructor                                  /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 pkgCacheFile::~pkgCacheFile()
 {
 // ---------------------------------------------------------------------
 /* */
 pkgCacheFile::~pkgCacheFile()
 {

+   delete DCache;
+   delete Policy;

    delete Cache;
    delete Map;
    delete Cache;
    delete Map;

-   delete Lock;
+   _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 (WithLock == true)
 {
    if (WithLock == true)

-      Lock = new pkgDpkgLock;
+      if (_system->Lock() == false)
+        return false;

    
    

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

    if (_error->PendingError() == true)
       return false;
    
    // Read the source list
    pkgSourceList List;
    if (List.ReadMainList() == 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.");
+      return _error->Error(_("The list of sources could not be read."));
+
+   // Read the caches
+   bool Res = pkgMakeStatusCache(List,Progress,&Map,!WithLock);
+   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 (_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;
+   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;

    
    

-   /* Build all of the caches, using the cache files if we are locking 
-      (ie as root) */
-   if (WithLock == true)
-   {
-      pkgMakeStatusCache(List,Progress);
-      Progress.Done();
-      if (_error->PendingError() == true)
-        return _error->Error("The package lists or status file could not be parsed or opened.");
-      if (_error->empty() == false)
-        _error->Warning("You may want to run apt-get update to correct these missing files");
-      
-      // Open the cache file
-      FileFd File(_config->FindFile("Dir::Cache::pkgcache"),FileFd::ReadOnly);
-      if (_error->PendingError() == true)
-        return false;
-      
-      Map = new MMap(File,MMap::Public | MMap::ReadOnly);
-      if (_error->PendingError() == true)
-        return false;
-   }
-   else
-   {
-      Map = pkgMakeStatusCacheMem(List,Progress);
-      Progress.Done();
-      if (Map == 0)
-        return false;
-   }
+   // The policy engine
+   Policy = new pkgPolicy(Cache);
+   if (_error->PendingError() == true)
+      return false;
+   if (ReadPinFile(*Policy) == false)
+      return false;

    
    // Create the dependency cache
    
    // Create the dependency cache

-   Cache = new pkgDepCache(*Map,Progress);
+   DCache = new pkgDepCache(Cache,Policy);
+   if (_error->PendingError() == true)
+      return false;
+   
+   DCache->Init(&Progress);

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


@@ -93,3 +108,22 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+
+
+// CacheFile::Close - close the cache files                            /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgCacheFile::Close()
+{
+   delete DCache;
+   delete Policy;
+   delete Cache;
+   delete Map;
+   _system->UnLock(true);
+
+   Map = 0;
+   DCache = 0;
+   Policy = 0;
+   Cache = 0;
+}
+                                                                       /*}}}*/