merge with lp:~mvo/apt/debian-sid

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 210127ab9125e321f5138242898baed9ce29d78d..cee30b679f3509d00611593eac0c062b5731ab7d 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -30,18 +30,16 @@
 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 
 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 

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

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

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

 
 #include <iostream>
 
 using std::ostream;
 
 
 #include <iostream>
 
 using std::ostream;
 

-class pkgSimulate : public pkgPackageManager
+class pkgSimulate : public pkgPackageManager                           /*{{{*/

 {
    protected:
 
 {
    protected:
 


@@ -62,6 +60,7 @@ class pkgSimulate : public pkgPackageManager
    
    Policy iPolicy;
    pkgDepCache Sim;
    
    Policy iPolicy;
    pkgDepCache Sim;

+   pkgDepCache::ActionGroup group;

    
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);
    
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);


@@ -76,8 +75,8 @@ private:
 
    pkgSimulate(pkgDepCache *Cache);
 };
 
    pkgSimulate(pkgDepCache *Cache);
 };

-
-class pkgProblemResolver
+                                                                       /*}}}*/
+class pkgProblemResolver                                               /*{{{*/

 {
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
 {
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;


@@ -118,13 +117,14 @@ class pkgProblemResolver
    
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
    
    // Try to resolve problems only by using keep
    bool ResolveByKeep();

-   
+
+   // Install all protected packages   

    void InstallProtect();   
    
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 };
    void InstallProtect();   
    
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 };

-
+                                                                       /*}}}*/

 bool pkgDistUpgrade(pkgDepCache &Cache);
 bool pkgApplyStatus(pkgDepCache &Cache);
 bool pkgFixBroken(pkgDepCache &Cache);
 bool pkgDistUpgrade(pkgDepCache &Cache);
 bool pkgApplyStatus(pkgDepCache &Cache);
 bool pkgFixBroken(pkgDepCache &Cache);


@@ -133,8 +133,6 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 

-// mark all reachable packages, everything that is not reach can 
-// be removed
-bool pkgMarkUsed(pkgDepCache &Cache);
+bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);

                     
 #endif
                     
 #endif