improve the API for Upgrade()

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 582cbc527b1c9b4e7d252fae526318319118a0bb..9ff84e3ffd4781031e0c958085431eef122344e0 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -33,11 +33,26 @@
 
 #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>
 
 
 #include <iostream>
 

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

 using std::ostream;
 using std::ostream;

+#endif
+
+class pkgAcquireStatus;
+
+namespace APT {
+   namespace Upgrade {
+      enum UpgradeMode {NO_INSTALL_OR_REMOVE,
+                        ALLOW_NEW_INSTALLS,
+                        ALLOW_REMOVAL_AND_NEW_INSTALLS};
+      bool Upgrade(pkgDepCache &Cache, UpgradeMode mode);
+   }
+}

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


@@ -63,21 +78,26 @@ class pkgSimulate : public pkgPackageManager                                /*{{{*/
    pkgDepCache::ActionGroup group;
    
    // The Actuall installation implementation
    pkgDepCache::ActionGroup group;
    
    // The Actuall installation implementation

-   virtual bool Install(PkgIterator Pkg,string File);
+   virtual bool Install(PkgIterator Pkg,std::string File);

    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);
 
 private:
    void ShortBreaks();
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);
 
 private:
    void ShortBreaks();

-   void Describe(PkgIterator iPkg,ostream &out,bool Current,bool Candidate);
+   void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candidate);

    
    public:
 
    pkgSimulate(pkgDepCache *Cache);
    
    public:
 
    pkgSimulate(pkgDepCache *Cache);

+   ~pkgSimulate();

 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 {
 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 {

+ private:
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

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


@@ -89,7 +109,7 @@ class pkgProblemResolver                                             /*{{{*/
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
                Upgradable = (1 << 2), ReInstateTried = (1 << 3),
                ToRemove = (1 << 4)};
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
                Upgradable = (1 << 2), ReInstateTried = (1 << 3),
                ToRemove = (1 << 4)};

-   signed short *Scores;
+   int *Scores;

    unsigned char *Flags;
    bool Debug;
    
    unsigned char *Flags;
    bool Debug;
    


@@ -109,6 +129,9 @@ class pkgProblemResolver                                            /*{{{*/
    bool ResolveInternal(bool const BrokenFix = false);
    bool ResolveByKeepInternal();
    
    bool ResolveInternal(bool const BrokenFix = false);
    bool ResolveByKeepInternal();
    

+   protected:
+   bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
+

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


@@ -121,9 +144,8 @@ 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();   
-   
+   __deprecated void InstallProtect();
+

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


@@ -131,11 +153,15 @@ class 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);

+

 bool pkgAllUpgrade(pkgDepCache &Cache);
 bool pkgAllUpgrade(pkgDepCache &Cache);

+

 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 
 bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);
 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 
 bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);

-                    
+bool AcquireUpdate(pkgAcquire &Fetcher, int const PulseInterval = 0,
+                  bool const RunUpdateScripts = true, bool const ListCleanup = true);
+

 #endif
 #endif