merge the AutoInstOk patch from debian-experimental

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

diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index fd935c2680f1f1cf68a9456dc3067e07a31af6bc..10f9c109164d43476286c54597017d77433b8d62 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>


@@ -48,6 +45,7 @@
 #include <regex.h>
 
 #include <vector>
 #include <regex.h>
 
 #include <vector>

+#include <memory>

 
 class pkgDepCache : protected pkgCache::Namespace
 {
 
 class pkgDepCache : protected pkgCache::Namespace
 {


@@ -94,7 +92,7 @@ class pkgDepCache : protected pkgCache::Namespace
     *  \param rootFunc A callback that can be used to add extra
     *  packages to the root set.
     *
     *  \param rootFunc A callback that can be used to add extra
     *  packages to the root set.
     *

-    *  \return \b false if an error occured.
+    *  \return \b false if an error occurred.

     */
    bool MarkRequired(InRootSetFunc &rootFunc);
 
     */
    bool MarkRequired(InRootSetFunc &rootFunc);
 


@@ -105,7 +103,7 @@ class pkgDepCache : protected pkgCache::Namespace
     *  are tested to see whether they are actually garbage.  If so,
     *  they are marked as such.
     *
     *  are tested to see whether they are actually garbage.  If so,
     *  they are marked as such.
     *

-    *  \return \b false if an error occured.
+    *  \return \b false if an error occurred.

     */
    bool Sweep();
 
     */
    bool Sweep();
 


@@ -248,7 +246,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,8 +292,12 @@ 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;
    unsigned long iBadCount;

-   
+
+   bool DebugMarker;
+   bool DebugAutoInstall;
+

    Policy *delLocalPolicy;           // For memory clean up..
    Policy *LocalPolicy;
    
    Policy *delLocalPolicy;           // For memory clean up..
    Policy *LocalPolicy;
    


@@ -359,6 +363,20 @@ class pkgDepCache : protected pkgCache::Namespace
     */
    virtual bool MarkFollowsSuggests();
 
     */
    virtual bool MarkFollowsSuggests();
 

+   /** \return \b true if it's OK for MarkInstall to recursively
+    *  install the given version of the given package.
+    *
+    *  \param p  the package that MarkInstall wants to install.
+    *  \param v  the version being installed, or an end iterator
+    *            if p is being removed.
+    *  \param d  the dependency being fixed.
+    *
+    *  The default implementation unconditionally returns \b true.
+    */
+   virtual bool AutoInstOk(const PkgIterator &p,
+                          const VerIterator &v,
+                          const DepIterator &d);
+

    /** \brief Update the Marked and Garbage fields of all packages.
     *
     *  This routine is implicitly invoked after all state manipulators
    /** \brief Update the Marked and Garbage fields of all packages.
     *
     *  This routine is implicitly invoked after all state manipulators


@@ -386,10 +404,13 @@ class pkgDepCache : protected pkgCache::Namespace
     */
    // @{
    void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
     */
    // @{
    void MarkKeep(PkgIterator const &Pkg, bool Soft = false,

-                bool FromUser = true);
-   void MarkDelete(PkgIterator const &Pkg,bool Purge = false);
+                bool FromUser = true, unsigned long Depth = 0);
+   void MarkDelete(PkgIterator const &Pkg, bool Purge = false,
+                   unsigned long Depth = 0);

    void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
    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 +423,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 +432,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);