merged net-update fixes from apt--mvo

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

diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index 23bd4008badc1aaf1c6fd11b115abbe63ca0a001..3b057951c81fdfa5dff93809ec6ef3979e396a5e 100644 (file)
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cachefile.h,v 1.1 1999/04/18 06:36:36 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
 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot


@@ -9,37 +9,45 @@
    of caches. It can operate as root, as not root, show progress and so on,
    it transparently handles everything necessary.
    
    of caches. It can operate as root, as not root, show progress and so on,
    it transparently handles everything necessary.
    

+   This means it can rebuild caches from the source list and instantiates
+   and prepares the standard policy mechanism.
+   

    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/cachefile.h"
-#endif 

 
 #include <apt-pkg/depcache.h>
 
 #include <apt-pkg/depcache.h>

-#include <apt-pkg/dpkginit.h>
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/sourcelist.h>

 
 

+class pkgPolicy;

 class pkgCacheFile
 {
    protected:
    
    MMap *Map;
 class pkgCacheFile
 {
    protected:
    
    MMap *Map;

-   pkgDepCache *Cache;
-   pkgDpkgLock *Lock;
+   pkgCache *Cache;
+   pkgDepCache *DCache;

    
    public:
    
    public:

+
+   pkgPolicy *Policy;

       
    // We look pretty much exactly like a pointer to a dep cache
       
    // We look pretty much exactly like a pointer to a dep cache

-   inline operator pkgDepCache &() {return *Cache;};
-   inline pkgDepCache *operator ->() {return Cache;};
-   inline pkgDepCache &operator *() {return *Cache;};
+   inline operator pkgCache &() {return *Cache;};
+   inline operator pkgCache *() {return Cache;};
+   inline operator pkgDepCache &() {return *DCache;};
+   inline operator pkgDepCache *() {return DCache;};
+   inline pkgDepCache *operator ->() {return DCache;};
+   inline pkgDepCache &operator *() {return *DCache;};
+   inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) {return (*DCache)[I];};
+   inline unsigned char &operator [](pkgCache::DepIterator const &I) {return (*DCache)[I];};

 
 

-   // Release the dpkg status lock
-   inline void ReleaseLock() {Lock->Close();};
-   
+   bool BuildCaches(OpProgress &Progress,bool WithLock = true);

    bool Open(OpProgress &Progress,bool WithLock = true);
    bool Open(OpProgress &Progress,bool WithLock = true);

+   void Close();

    
    pkgCacheFile();
    ~pkgCacheFile();
    
    pkgCacheFile();
    ~pkgCacheFile();