* Swedish translation update. Closes: #592366

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

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 2efa0522cd92ae72e950d0adb6e761eea0d7369c..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.3 1999/05/04 20:09:48 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,84 +12,173 @@
    ##################################################################### */
                                                                        /*}}}*/
 // 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(NULL), Cache(NULL), DCache(NULL),
+                               SrcList(NULL), Policy(NULL)

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

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

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

+   delete DCache;
+   delete Policy;
+   delete SrcList;

    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)
-      Lock = new pkgDpkgLock;
-   
-   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.");
-   
-   /* Build all of the caches, using the cache files if we are locking 
-      (ie as root) */
-   if (WithLock == true)
+   if (Cache != NULL)
+      return true;
+
+   if (_config->FindB("pkgCacheFile::Generate", true) == false)

    {
    {

-      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 theses 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);
+      Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"),
+                    FileFd::ReadOnly),MMap::Public|MMap::ReadOnly);
+      Cache = new pkgCache(Map);

       if (_error->PendingError() == true)
       if (_error->PendingError() == true)

-        return false;
+         return false;
+      return true;

    }
    }

-   else
-   {
-      Map = pkgMakeStatusCacheMem(List,Progress);
-      Progress.Done();
-      if (Map == 0)
+
+   const bool ErrorWasEmpty = _error->empty();
+   if (WithLock == true)
+      if (_system->Lock() == false)

         return false;
         return false;

-   }

    
    

-   // Create the dependency cache
-   Cache = new pkgDepCache(*Map,Progress);
-   Progress.Done();
+   if (_config->FindB("Debug::NoLocking",false) == true)
+      WithLock = false;
+      
+   if (_error->PendingError() == true)
+      return false;
+
+   BuildSourceList(Progress);
+
+   // Read the caches
+   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 (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;
+   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;
+
+   if (ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false)
+      return false;
+
+   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->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                            /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgCacheFile::Close()
+{
+   delete DCache;
+   delete Policy;
+   delete Cache;
+   delete SrcList;
+   delete Map;
+   _system->UnLock(true);
+
+   Map = NULL;
+   DCache = NULL;
+   Policy = NULL;
+   Cache = NULL;
+   SrcList = NULL;
+}
+                                                                       /*}}}*/