merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 0dd77d940a79861cc780f0f1121a29c170855cbd..aff8a68f2ce1a2691660bfd35db5bc29b01e795c 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: algorithms.h,v 1.1 1998/07/07 04:17:00 jgg Exp $
+// $Id: algorithms.h,v 1.10 2001/05/22 04:17:41 jgg Exp $

 /* ######################################################################
 
    Algorithms - A set of misc algorithms
 /* ######################################################################
 
    Algorithms - A set of misc algorithms


@@ -14,41 +14,78 @@
    
    pkgApplyStatus sets the target state based on the content of the status
    field in the status file. It is important to get proper crash recovery.
    
    pkgApplyStatus sets the target state based on the content of the status
    field in the status file. It is important to get proper crash recovery.

+
+   pkgFixBroken corrects a broken system so that it is in a sane state.
+ 
+   pkgAllUpgrade attempts to upgade as many packages as possible but 
+   without installing new packages.

    
    

+   The problem resolver class contains a number of complex algorithms
+   to try to best-guess an upgrade state. It solves the problem of 
+   maximizing the number of install state packages while having no broken
+   packages. 
+

    ##################################################################### */
                                                                        /*}}}*/
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 
 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 

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

 
 

-#include <pkglib/packagemanager.h>
-#include <pkglib/depcache.h>
+#include <apt-pkg/packagemanager.h>
+#include <apt-pkg/depcache.h>
+
+#include <iostream>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/acquire.h>
+using std::ostream;
+#endif
+
+class pkgAcquireStatus;

 
 

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

 {
    protected:
 
 {
    protected:
 

+   class Policy : public pkgDepCache::Policy
+   {
+      pkgDepCache *Cache;
+      public:
+      
+      virtual VerIterator GetCandidateVer(PkgIterator const &Pkg)
+      {
+        return (*Cache)[Pkg].CandidateVerIter(*Cache);
+      }
+      
+      Policy(pkgDepCache *Cache) : Cache(Cache) {};
+   };
+   

    unsigned char *Flags;
    
    unsigned char *Flags;
    

+   Policy iPolicy;

    pkgDepCache Sim;
    pkgDepCache Sim;

+   pkgDepCache::ActionGroup group;

    
    // The Actuall installation implementation
    
    // 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 Configure(PkgIterator Pkg);

-   virtual bool Remove(PkgIterator Pkg);
+   virtual bool Remove(PkgIterator Pkg,bool Purge);
+
+private:

    void ShortBreaks();
    void ShortBreaks();

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

    
    public:
 
    
    public:
 

-   pkgSimulate(pkgDepCache &Cache);
+   pkgSimulate(pkgDepCache *Cache);
+   ~pkgSimulate();

 };
 };

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

 {
 {

+   /** \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;


@@ -58,8 +95,9 @@ class pkgProblemResolver
    typedef pkgCache::Package Package;
    
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
    typedef pkgCache::Package Package;
    
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),

-               Upgradable = (1 << 2)};
-   signed short *Scores;
+               Upgradable = (1 << 2), ReInstateTried = (1 << 3),
+               ToRemove = (1 << 4)};
+   int *Scores;

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


@@ -75,17 +113,42 @@ class pkgProblemResolver
 
    void MakeScores();
    bool DoUpgrade(pkgCache::PkgIterator Pkg);
 
    void MakeScores();
    bool DoUpgrade(pkgCache::PkgIterator Pkg);

+
+   bool ResolveInternal(bool const BrokenFix = false);
+   bool ResolveByKeepInternal();

    
    

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

    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);};
+   
+   // Try to intelligently resolve problems by installing and removing packages   

    bool Resolve(bool BrokenFix = false);
    
    bool Resolve(bool BrokenFix = false);
    

-   pkgProblemResolver(pkgDepCache &Cache);
-};
+   // Try to resolve problems only by using keep
+   bool ResolveByKeep();

 
 

+   // Install all protected packages   
+   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);

+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 AcquireUpdate(pkgAcquire &Fetcher, int const PulseInterval = 0,
+                  bool const RunUpdateScripts = true, bool const ListCleanup = true);

 
 #endif
 
 #endif