* apt-pkg/packagemanager.{cc,h}:

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

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 74d136afbdadd422cdad26228c1d75ccec11db58..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.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,6 +19,8 @@
 #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>
                                                                        /*}}}*/


@@ -46,15 +44,18 @@ pkgCacheFile::~pkgCacheFile()
    _system->UnLock(true);
 }   
                                                                        /*}}}*/
    _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 (_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;
    


@@ -71,11 +72,21 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
 
    /* This sux, remove it someday */
    if (_error->empty() == false)
 
    /* This sux, remove it someday */
    if (_error->empty() == false)

-      _error->Warning(_("You may want to run apt-get update to correct these missing files"));
+      _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;

+   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;

    
    // The policy engine
    Policy = new pkgPolicy(Cache);
    
    // The policy engine
    Policy = new pkgPolicy(Cache);


@@ -98,6 +109,7 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

+

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