strip the Dir::state from the config name as it will never be there

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

diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index 1647aff8eb095ce06f2ba5ed71ee4e27d26cb7eb..09d3ec2676675c3063f32f5cc016b11eb7d245fe 100644 (file)
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -20,10 +20,9 @@
 
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/acquire.h>
 
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/acquire.h>

+#include <apt-pkg/policy.h>

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

-class pkgPolicy;
-class pkgSourceList;

 class pkgCacheFile
 {
    protected:
 class pkgCacheFile
 {
    protected:


@@ -31,10 +30,10 @@ class pkgCacheFile
    MMap *Map;
    pkgCache *Cache;
    pkgDepCache *DCache;
    MMap *Map;
    pkgCache *Cache;
    pkgDepCache *DCache;

-   pkgPolicy *Policy;

    pkgSourceList *SrcList;
 
    public:
    pkgSourceList *SrcList;
 
    public:

+   pkgPolicy *Policy;

 
    // We look pretty much exactly like a pointer to a dep cache
    inline operator pkgCache &() {return *Cache;};
 
    // We look pretty much exactly like a pointer to a dep cache
    inline operator pkgCache &() {return *Cache;};


@@ -65,6 +64,11 @@ class pkgCacheFile
    inline pkgPolicy* GetPolicy() { BuildPolicy(); return Policy; };
    inline pkgSourceList* GetSourceList() { BuildSourceList(); return SrcList; };
 
    inline pkgPolicy* GetPolicy() { BuildPolicy(); return Policy; };
    inline pkgSourceList* GetSourceList() { BuildSourceList(); return SrcList; };
 

+   inline bool IsPkgCacheBuilt() const { return (Cache != NULL); };
+   inline bool IsDepCacheBuilt() const { return (DCache != NULL); };
+   inline bool IsPolicyBuilt() const { return (Policy != NULL); };
+   inline bool IsSrcListBuilt() const { return (SrcList != NULL); };
+

    pkgCacheFile();
    virtual ~pkgCacheFile();
 };
    pkgCacheFile();
    virtual ~pkgCacheFile();
 };