'apt-get update' no longer does 'Building Dependency Tree'.

Author: jgg
Date: 2002-04-27 04:28:04 GMT
'apt-get update' no longer does 'Building Dependency Tree'.

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 8b3b02171de95575aa3b407f6a55b605c67905ab..ab3003092f6b8909286dc80b2257b379407a5589 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.7 2001/07/01 20:49:08 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,10 +46,10 @@ 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)
@@ -79,6 +79,16 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
    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);

diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index e2540ed580c0a4f52e6ac595c8a3358d031e4f2f..a128c29ab07f2221f6dd2ac4106fd745707a03e2 100644 (file)
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: cachefile.h,v 1.4 2001/02/20 07:03:17 jgg Exp $
+// $Id: cachefile.h,v 1.5 2002/04/27 04:28:04 jgg Exp $
 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot
@@ -46,6 +46,7 @@ class pkgCacheFile
    inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) {return (*DCache)[I];};
    inline unsigned char &operator [](pkgCache::DepIterator const &I) {return (*DCache)[I];};
 
+   bool BuildCaches(OpProgress &Progress,bool WithLock = true);
    bool Open(OpProgress &Progress,bool WithLock = true);
    void Close();
    

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 229acf13ce3bfe6ca8c7d25615d56d3eaddbf5c3..9708fb0772dae55c66c84a3829e72d5850234770 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-get.cc,v 1.119 2002/04/26 05:36:43 jgg Exp $
+// $Id: apt-get.cc,v 1.120 2002/04/27 04:28:04 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -80,6 +80,13 @@ class CacheFile : public pkgCacheFile
    
    void Sort();
    bool CheckDeps(bool AllowBroken = false);
+   bool BuildCaches(bool WithLock = true)
+   {
+      OpTextProgress Prog(*_config);
+      if (pkgCacheFile::BuildCaches(Prog,WithLock) == false)
+        return false;
+      return true;
+   }
    bool Open(bool WithLock = true) 
    {
       OpTextProgress Prog(*_config);
@@ -1224,7 +1231,7 @@ bool DoUpdate(CommandLine &CmdL)
    
    // Prepare the cache.   
    CacheFile Cache;
-   if (Cache.Open() == false)
+   if (Cache.BuildCaches() == false)
       return false;
    
    if (Failed == true)