* merged from main

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

diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index fd935c2680f1f1cf68a9456dc3067e07a31af6bc..84fed7f3732fc455bdab2c298680928cfc7c1f17 100644 (file)
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -38,9 +38,6 @@
 #ifndef PKGLIB_DEPCACHE_H
 #define PKGLIB_DEPCACHE_H
 
 #ifndef PKGLIB_DEPCACHE_H
 #define PKGLIB_DEPCACHE_H
 

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

 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/progress.h>
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/progress.h>


@@ -248,7 +245,9 @@ class pkgDepCache : protected pkgCache::Namespace
       inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;};
       inline bool Held() const {return Status != 0 && Keep();};
       inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;};
       inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;};
       inline bool Held() const {return Status != 0 && Keep();};
       inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;};

+      inline bool NowPolicyBroken() const {return (DepState & DepNowPolicy) != DepNowPolicy;};

       inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;};
       inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;};

+      inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;};

       inline bool Install() const {return Mode == ModeInstall;};
       inline VerIterator InstVerIter(pkgCache &Cache)
                 {return VerIterator(Cache,InstallVer);};
       inline bool Install() const {return Mode == ModeInstall;};
       inline VerIterator InstVerIter(pkgCache &Cache)
                 {return VerIterator(Cache,InstallVer);};


@@ -292,6 +291,7 @@ class pkgDepCache : protected pkgCache::Namespace
    unsigned long iDelCount;
    unsigned long iKeepCount;
    unsigned long iBrokenCount;
    unsigned long iDelCount;
    unsigned long iKeepCount;
    unsigned long iBrokenCount;

+   unsigned long iPolicyBrokenCount;

    unsigned long iBadCount;
    
    Policy *delLocalPolicy;           // For memory clean up..
    unsigned long iBadCount;
    
    Policy *delLocalPolicy;           // For memory clean up..


@@ -389,7 +389,8 @@ class pkgDepCache : protected pkgCache::Namespace
                 bool FromUser = true);
    void MarkDelete(PkgIterator const &Pkg,bool Purge = false);
    void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
                 bool FromUser = true);
    void MarkDelete(PkgIterator const &Pkg,bool Purge = false);
    void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,

-                   unsigned long Depth = 0, bool FromUser = true);
+                   unsigned long Depth = 0, bool FromUser = true,
+                   bool ForceImportantDeps = false);

    void SetReInstall(PkgIterator const &Pkg,bool To);
    void SetCandidateVersion(VerIterator TargetVer);
 
    void SetReInstall(PkgIterator const &Pkg,bool To);
    void SetCandidateVersion(VerIterator TargetVer);
 


@@ -402,7 +403,7 @@ class pkgDepCache : protected pkgCache::Namespace
 
    // read persistent states
    bool readStateFile(OpProgress *prog);
 
    // read persistent states
    bool readStateFile(OpProgress *prog);

-   bool writeStateFile(OpProgress *prog);
+   bool writeStateFile(OpProgress *prog, bool InstalledOnly=false);

    
    // Size queries
    inline double UsrSize() {return iUsrSize;};
    
    // Size queries
    inline double UsrSize() {return iUsrSize;};


@@ -411,6 +412,7 @@ class pkgDepCache : protected pkgCache::Namespace
    inline unsigned long KeepCount() {return iKeepCount;};
    inline unsigned long InstCount() {return iInstCount;};
    inline unsigned long BrokenCount() {return iBrokenCount;};
    inline unsigned long KeepCount() {return iKeepCount;};
    inline unsigned long InstCount() {return iInstCount;};
    inline unsigned long BrokenCount() {return iBrokenCount;};

+   inline unsigned long PolicyBrokenCount() {return iPolicyBrokenCount;};

    inline unsigned long BadCount() {return iBadCount;};
 
    bool Init(OpProgress *Prog);
    inline unsigned long BadCount() {return iBadCount;};
 
    bool Init(OpProgress *Prog);