QT1 license exception

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

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 285eb310f8f1108feb2b8f16837e74e029287307..d7f3c09370c98fa94c7f4fdd32d48cb060c53460 100644 (file)
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: cachefile.cc,v 1.1 1999/04/18 06:36:36 jgg Exp $
+// $Id: cachefile.cc,v 1.4 1999/06/24 04:06:30 jgg Exp $
 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot
@@ -26,7 +26,7 @@
 // CacheFile::CacheFile - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgCacheFile::pkgCacheFile() : Map(0), Cache(0), Lock() 
+pkgCacheFile::pkgCacheFile() : Map(0), Cache(0), Lock(0) 
 {
 }
                                                                        /*}}}*/
@@ -65,7 +65,7 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
       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");
+        _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);
@@ -86,10 +86,9 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
    
    // Create the dependency cache
    Cache = new pkgDepCache(*Map,Progress);
+   Progress.Done();
    if (_error->PendingError() == true)
       return false;
-
-   Progress.Done();
    
    return true;
 }