* apt-pkg/deb/dpkgpm.cc:

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index b72874d8e216687c4edfd0474008f730b71b7b16..ebe31cc103024ab08124cb57bf5d8b400cbf7329 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -33,12 +33,13 @@
 
 #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:
 


@@ -47,7 +48,7 @@ class pkgSimulate : public pkgPackageManager
       pkgDepCache *Cache;
       public:
       
       pkgDepCache *Cache;
       public:
       

-      virtual VerIterator GetCandidateVer(PkgIterator Pkg)
+      virtual VerIterator GetCandidateVer(PkgIterator const &Pkg)

       {
         return (*Cache)[Pkg].CandidateVerIter(*Cache);
       }
       {
         return (*Cache)[Pkg].CandidateVerIter(*Cache);
       }


@@ -59,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);


@@ -73,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;


@@ -106,7 +108,7 @@ class pkgProblemResolver
    
    public:
    
    
    public:
    

-   inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected;};
+   inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};

    inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
    inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
    
    inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
    inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
    


@@ -122,7 +124,7 @@ class pkgProblemResolver
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 };
    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);


@@ -130,5 +132,7 @@ bool pkgAllUpgrade(pkgDepCache &Cache);
 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);

+
+bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);

                     
 #endif
                     
 #endif