X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b2e465d6d32d2dc884f58b94acb7e35f671a87fe..e0c4f06387ade5761e644b5b96e41284c12da23c:/apt-pkg/cachefile.cc

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 74d136afb..ab3003092 100644
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -1,6 +1,6 @@
 // -*- 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
@@ -46,15 +46,18 @@ pkgCacheFile::~pkgCacheFile()
    _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 (_config->FindB("Debug::NoLocking",false) == true)
+      WithLock = false;
+      
    if (_error->PendingError() == true)
       return false;
    
@@ -71,11 +74,21 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
 
    /* 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;
+   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);