* merged changes from Kamions upload (thanks!)

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

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 43593e71b884b566bb0acb62e569dabb572807fa..ac9d3be0bea35a05c93d4545c1996c8c7a91f349 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: algorithms.cc,v 1.15 1999/01/30 02:12:53 jgg Exp $
+// $Id: algorithms.cc,v 1.44 2002/11/28 18:49:16 jgg Exp $

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


@@ -20,19 +20,61 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>

-#include <iostream.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/sptr.h>
+
+    
+#include <apti18n.h>
+#include <sys/types.h>
+#include <iostream>

                                                                        /*}}}*/
                                                                        /*}}}*/

+using namespace std;

 
 pkgProblemResolver *pkgProblemResolver::This = 0;
 
 // Simulate::Simulate - Constructor                                    /*{{{*/
 // ---------------------------------------------------------------------
 
 pkgProblemResolver *pkgProblemResolver::This = 0;
 
 // Simulate::Simulate - Constructor                                    /*{{{*/
 // ---------------------------------------------------------------------

-/* */
-pkgSimulate::pkgSimulate(pkgDepCache &Cache) : pkgPackageManager(Cache), 
-                            Sim(Cache.GetMap())
+/* The legacy translations here of input Pkg iterators is obsolete, 
+   this is not necessary since the pkgCaches are fully shared now. */
+pkgSimulate::pkgSimulate(pkgDepCache *Cache) : pkgPackageManager(Cache),
+                           iPolicy(Cache),
+                            Sim(&Cache->GetCache(),&iPolicy)
+{
+   Sim.Init(0);
+   Flags = new unsigned char[Cache->Head().PackageCount];
+   memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount);
+
+   // Fake a filename so as not to activate the media swapping
+   string Jnk = "SIMULATE";
+   for (unsigned int I = 0; I != Cache->Head().PackageCount; I++)
+      FileNames[I] = Jnk;
+}
+                                                                       /*}}}*/
+// Simulate::Describe - Describe a package                             /*{{{*/
+// ---------------------------------------------------------------------
+/* Parameter Current == true displays the current package version,
+   Parameter Candidate == true displays the candidate package version */
+void pkgSimulate::Describe(PkgIterator Pkg,ostream &out,bool Current,bool Candidate)

 {
 {

-   Flags = new unsigned char[Cache.HeaderP->PackageCount];
-   memset(Flags,0,sizeof(*Flags)*Cache.HeaderP->PackageCount);
+   VerIterator Ver(Sim);
+ 
+   out << Pkg.Name();
+
+   if (Current == true)
+   {
+      Ver = Pkg.CurrentVer();
+      if (Ver.end() == false)
+         out << " [" << Ver.VerStr() << ']';
+   }
+
+   if (Candidate == true)
+   {
+      Ver = Sim[Pkg].CandidateVerIter(Sim);
+      if (Ver.end() == true)
+         return;
+   
+      out << " (" << Ver.VerStr() << ' ' << Ver.RelStr() << ')';
+   }

 }
                                                                        /*}}}*/
 // Simulate::Install - Simulate unpacking of a package                 /*{{{*/
 }
                                                                        /*}}}*/
 // Simulate::Install - Simulate unpacking of a package                 /*{{{*/


@@ -44,7 +86,8 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/)
    PkgIterator Pkg = Sim.FindPkg(iPkg.Name());
    Flags[Pkg->ID] = 1;
    
    PkgIterator Pkg = Sim.FindPkg(iPkg.Name());
    Flags[Pkg->ID] = 1;
    

-   cout << "Inst " << Pkg.Name();
+   cout << "Inst ";
+   Describe(Pkg,cout,true,true);

    Sim.MarkInstall(Pkg,false);
    
    // Look for broken conflicts+predepends.
    Sim.MarkInstall(Pkg,false);
    
    // Look for broken conflicts+predepends.


@@ -53,16 +96,23 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/)
       if (Sim[I].InstallVer == 0)
         continue;
       
       if (Sim[I].InstallVer == 0)
         continue;
       

-      for (DepIterator D = Sim[I].InstVerIter(Sim).DependsList(); D.end() == false; D++)
-        if (D->Type == pkgCache::Dep::Conflicts || D->Type == pkgCache::Dep::PreDepends)
+      for (DepIterator D = Sim[I].InstVerIter(Sim).DependsList(); D.end() == false;)
+      {
+        DepIterator Start;
+        DepIterator End;
+        D.GlobOr(Start,End);
+        if (Start->Type == pkgCache::Dep::Conflicts ||
+            Start->Type == pkgCache::Dep::Obsoletes ||
+            End->Type == pkgCache::Dep::PreDepends)

          {
          {

-           if ((Sim[D] & pkgDepCache::DepInstall) == 0)
+           if ((Sim[End] & pkgDepCache::DepGInstall) == 0)

            {
            {

-              cout << " [" << I.Name() << " on " << D.TargetPkg().Name() << ']';
-              if (D->Type == pkgCache::Dep::Conflicts)
+              cout << " [" << I.Name() << " on " << Start.TargetPkg().Name() << ']';
+              if (Start->Type == pkgCache::Dep::Conflicts)

                  _error->Error("Fatal, conflicts violated %s",I.Name());
            }       
                  _error->Error("Fatal, conflicts violated %s",I.Name());
            }       

-        }      
+        }
+      }      

    }
 
    if (Sim.BrokenCount() != 0)
    }
 
    if (Sim.BrokenCount() != 0)


@@ -97,7 +147,9 @@ bool pkgSimulate::Configure(PkgIterator iPkg)
             (Sim[D] & pkgDepCache::DepInstall) != 0)
            continue;
         
             (Sim[D] & pkgDepCache::DepInstall) != 0)
            continue;
         

-        if (D->Type == pkgCache::Dep::Conflicts)
+        if (D->Type == pkgCache::Dep::Obsoletes)
+           cout << " Obsoletes:" << D.TargetPkg().Name();
+        else if (D->Type == pkgCache::Dep::Conflicts)

            cout << " Conflicts:" << D.TargetPkg().Name();
         else
            cout << " Depends:" << D.TargetPkg().Name();
            cout << " Conflicts:" << D.TargetPkg().Name();
         else
            cout << " Depends:" << D.TargetPkg().Name();


@@ -107,7 +159,10 @@ bool pkgSimulate::Configure(PkgIterator iPkg)
       _error->Error("Conf Broken %s",Pkg.Name());
    }   
    else
       _error->Error("Conf Broken %s",Pkg.Name());
    }   
    else

-      cout << "Conf " <<  Pkg.Name();
+   {
+      cout << "Conf "; 
+      Describe(Pkg,cout,false,true);
+   }

 
    if (Sim.BrokenCount() != 0)
       ShortBreaks();
 
    if (Sim.BrokenCount() != 0)
       ShortBreaks();


@@ -120,14 +175,18 @@ bool pkgSimulate::Configure(PkgIterator iPkg)
 // Simulate::Remove - Simulate the removal of a package                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Simulate::Remove - Simulate the removal of a package                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool pkgSimulate::Remove(PkgIterator iPkg)
+bool pkgSimulate::Remove(PkgIterator iPkg,bool Purge)

 {
    // Adapt the iterator
    PkgIterator Pkg = Sim.FindPkg(iPkg.Name());
 
    Flags[Pkg->ID] = 3;
    Sim.MarkDelete(Pkg);
 {
    // Adapt the iterator
    PkgIterator Pkg = Sim.FindPkg(iPkg.Name());
 
    Flags[Pkg->ID] = 3;
    Sim.MarkDelete(Pkg);

-   cout << "Remv " << Pkg.Name();
+   if (Purge == true)
+      cout << "Purg ";
+   else
+      cout << "Remv ";
+   Describe(Pkg,cout,true,false);

 
    if (Sim.BrokenCount() != 0)
       ShortBreaks();
 
    if (Sim.BrokenCount() != 0)
       ShortBreaks();


@@ -163,22 +222,50 @@ void pkgSimulate::ShortBreaks()
    the necessary calculations to deal with the problems. */
 bool pkgApplyStatus(pkgDepCache &Cache)
 {
    the necessary calculations to deal with the problems. */
 bool pkgApplyStatus(pkgDepCache &Cache)
 {

+   pkgDepCache::ActionGroup group(Cache);
+

    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {

+      if (I->VersionList == 0)
+        continue;
+        

       // Only choice for a ReInstReq package is to reinstall
       if (I->InstState == pkgCache::State::ReInstReq ||
          I->InstState == pkgCache::State::HoldReInstReq)
       {
       // Only choice for a ReInstReq package is to reinstall
       if (I->InstState == pkgCache::State::ReInstReq ||
          I->InstState == pkgCache::State::HoldReInstReq)
       {

-        Cache.MarkKeep(I);
+        if (I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true)
+           Cache.MarkKeep(I, false, false);
+        else
+        {
+           // Is this right? Will dpkg choke on an upgrade?
+           if (Cache[I].CandidateVer != 0 &&
+                Cache[I].CandidateVerIter(Cache).Downloadable() == true)
+              Cache.MarkInstall(I, false, 0, false);
+           else
+              return _error->Error(_("The package %s needs to be reinstalled, "
+                                   "but I can't find an archive for it."),I.Name());
+        }
+        

         continue;
       }
       
       switch (I->CurrentState)
       {
         continue;
       }
       
       switch (I->CurrentState)
       {

-        // This means installation failed somehow
+        /* This means installation failed somehow - it does not need to be
+           re-unpacked (probably) */

         case pkgCache::State::UnPacked:
         case pkgCache::State::HalfConfigured:
         case pkgCache::State::UnPacked:
         case pkgCache::State::HalfConfigured:

-        Cache.MarkKeep(I);
+        if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) ||
+            I.State() != pkgCache::PkgIterator::NeedsUnpack)
+           Cache.MarkKeep(I, false, false);
+        else
+        {
+           if (Cache[I].CandidateVer != 0 &&
+                Cache[I].CandidateVerIter(Cache).Downloadable() == true)
+              Cache.MarkInstall(I, true, 0, false);
+           else
+              Cache.MarkDelete(I);
+        }

         break;
 
         // This means removal failed
         break;
 
         // This means removal failed


@@ -201,10 +288,12 @@ bool pkgApplyStatus(pkgDepCache &Cache)
    on the result. */
 bool pkgFixBroken(pkgDepCache &Cache)
 {
    on the result. */
 bool pkgFixBroken(pkgDepCache &Cache)
 {

+   pkgDepCache::ActionGroup group(Cache);
+

    // Auto upgrade all broken packages
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       if (Cache[I].NowBroken() == true)
    // Auto upgrade all broken packages
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       if (Cache[I].NowBroken() == true)

-        Cache.MarkInstall(I,true);
+        Cache.MarkInstall(I, true, 0, false);

    
    /* Fix packages that are in a NeedArchive state but don't have a
       downloadable install version */
    
    /* Fix packages that are in a NeedArchive state but don't have a
       downloadable install version */


@@ -217,10 +306,10 @@ bool pkgFixBroken(pkgDepCache &Cache)
       if (Cache[I].InstVerIter(Cache).Downloadable() == false)
         continue;
 
       if (Cache[I].InstVerIter(Cache).Downloadable() == false)
         continue;
 

-      Cache.MarkInstall(I,true);      
+      Cache.MarkInstall(I, true, 0, false);

    }
    
    }
    

-   pkgProblemResolver Fix(Cache);
+   pkgProblemResolver Fix(&Cache);

    return Fix.Resolve(true);
 }
                                                                        /*}}}*/
    return Fix.Resolve(true);
 }
                                                                        /*}}}*/


@@ -234,35 +323,37 @@ bool pkgFixBroken(pkgDepCache &Cache)
  */
 bool pkgDistUpgrade(pkgDepCache &Cache)
 {
  */
 bool pkgDistUpgrade(pkgDepCache &Cache)
 {

+   pkgDepCache::ActionGroup group(Cache);
+

    /* Auto upgrade all installed packages, this provides the basis 
       for the installation */
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       if (I->CurrentVer != 0)
    /* Auto upgrade all installed packages, this provides the basis 
       for the installation */
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       if (I->CurrentVer != 0)

-        Cache.MarkInstall(I,true);
+        Cache.MarkInstall(I, true, 0, false);

 
    /* Now, auto upgrade all essential packages - this ensures that
       the essential packages are present and working */
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
 
    /* Now, auto upgrade all essential packages - this ensures that
       the essential packages are present and working */
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)

-        Cache.MarkInstall(I,true);
+        Cache.MarkInstall(I, true, 0, false);

    
    /* We do it again over all previously installed packages to force 
       conflict resolution on them all. */
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       if (I->CurrentVer != 0)
    
    /* We do it again over all previously installed packages to force 
       conflict resolution on them all. */
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       if (I->CurrentVer != 0)

-        Cache.MarkInstall(I,false);
+        Cache.MarkInstall(I, false, 0, false);

 
 

-   pkgProblemResolver Fix(Cache);
+   pkgProblemResolver Fix(&Cache);

 
    // Hold back held packages.
 
    // Hold back held packages.

-   if (_config->FindB("APT::Ingore-Hold",false) == false)
+   if (_config->FindB("APT::Ignore-Hold",false) == false)

    {
       for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       {
         if (I->SelectedState == pkgCache::State::Hold)
         {
            Fix.Protect(I);
    {
       for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       {
         if (I->SelectedState == pkgCache::State::Hold)
         {
            Fix.Protect(I);

-           Cache.MarkKeep(I);
+           Cache.MarkKeep(I, false, false);

         }
       }
    }
         }
       }
    }


@@ -277,7 +368,9 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
    to install packages not marked for install */
 bool pkgAllUpgrade(pkgDepCache &Cache)
 {
    to install packages not marked for install */
 bool pkgAllUpgrade(pkgDepCache &Cache)
 {

-   pkgProblemResolver Fix(Cache);
+   pkgDepCache::ActionGroup group(Cache);
+
+   pkgProblemResolver Fix(&Cache);

 
    if (Cache.BrokenCount() != 0)
       return false;
 
    if (Cache.BrokenCount() != 0)
       return false;


@@ -288,12 +381,12 @@ bool pkgAllUpgrade(pkgDepCache &Cache)
       if (Cache[I].Install() == true)
         Fix.Protect(I);
          
       if (Cache[I].Install() == true)
         Fix.Protect(I);
          

-      if (_config->FindB("APT::Ingore-Hold",false) == false)
+      if (_config->FindB("APT::Ignore-Hold",false) == false)

         if (I->SelectedState == pkgCache::State::Hold)
            continue;
       
       if (I->CurrentVer != 0 && Cache[I].InstallVer != 0)
         if (I->SelectedState == pkgCache::State::Hold)
            continue;
       
       if (I->CurrentVer != 0 && Cache[I].InstallVer != 0)

-        Cache.MarkInstall(I,false);
+        Cache.MarkInstall(I, false, 0, false);

    }
       
    return Fix.ResolveByKeep();
    }
       
    return Fix.ResolveByKeep();


@@ -306,11 +399,14 @@ bool pkgAllUpgrade(pkgDepCache &Cache)
    the package is restored. */
 bool pkgMinimizeUpgrade(pkgDepCache &Cache)
 {   
    the package is restored. */
 bool pkgMinimizeUpgrade(pkgDepCache &Cache)
 {   

+   pkgDepCache::ActionGroup group(Cache);
+

    if (Cache.BrokenCount() != 0)
       return false;
    
    if (Cache.BrokenCount() != 0)
       return false;
    

-   // We loop indefinately to get the minimal set size.
+   // We loop for 10 tries to get the minimal set size.

    bool Change = false;
    bool Change = false;

+   unsigned int Count = 0;

    do
    {
       Change = false;
    do
    {
       Change = false;


@@ -319,16 +415,21 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache)
         // Not interesting
         if (Cache[I].Upgrade() == false || Cache[I].NewInstall() == true)
            continue;
         // Not interesting
         if (Cache[I].Upgrade() == false || Cache[I].NewInstall() == true)
            continue;

-        
+

         // Keep it and see if that is OK
         // Keep it and see if that is OK

-        Cache.MarkKeep(I);
+        Cache.MarkKeep(I, false, false);

         if (Cache.BrokenCount() != 0)
         if (Cache.BrokenCount() != 0)

-           Cache.MarkInstall(I,false);
+           Cache.MarkInstall(I, false, 0, false);

         else
         else

-           Change = true;
+        {
+           // If keep didnt actually do anything then there was no change..
+           if (Cache[I].Upgrade() == false)
+              Change = true;
+        }       

       }      
       }      

+      Count++;

    }
    }

-   while (Change == true);
+   while (Change == true && Count < 10);

 
    if (Cache.BrokenCount() != 0)
       return _error->Error("Internal Error in pkgMinimizeUpgrade");
 
    if (Cache.BrokenCount() != 0)
       return _error->Error("Internal Error in pkgMinimizeUpgrade");


@@ -340,10 +441,10 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache)
 // ProblemResolver::pkgProblemResolver - Constructor                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ProblemResolver::pkgProblemResolver - Constructor                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgProblemResolver::pkgProblemResolver(pkgDepCache &Cache) : Cache(Cache)
+pkgProblemResolver::pkgProblemResolver(pkgDepCache *pCache) : Cache(*pCache)

 {
    // Allocate memory
 {
    // Allocate memory

-   unsigned long Size = Cache.HeaderP->PackageCount;
+   unsigned long Size = Cache.Head().PackageCount;

    Scores = new signed short[Size];
    Flags = new unsigned char[Size];
    memset(Flags,0,sizeof(*Flags)*Size);
    Scores = new signed short[Size];
    Flags = new unsigned char[Size];
    memset(Flags,0,sizeof(*Flags)*Size);


@@ -352,6 +453,15 @@ pkgProblemResolver::pkgProblemResolver(pkgDepCache &Cache) : Cache(Cache)
    Debug = _config->FindB("Debug::pkgProblemResolver",false);
 }
                                                                        /*}}}*/
    Debug = _config->FindB("Debug::pkgProblemResolver",false);
 }
                                                                        /*}}}*/

+// ProblemResolver::~pkgProblemResolver - Destructor                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgProblemResolver::~pkgProblemResolver()
+{
+   delete [] Scores;
+   delete [] Flags;
+}
+                                                                       /*}}}*/

 // ProblemResolver::ScoreSort - Sort the list by score                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ProblemResolver::ScoreSort - Sort the list by score                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -371,7 +481,7 @@ int pkgProblemResolver::ScoreSort(const void *a,const void *b)
 /* */
 void pkgProblemResolver::MakeScores()
 {
 /* */
 void pkgProblemResolver::MakeScores()
 {

-   unsigned long Size = Cache.HeaderP->PackageCount;
+   unsigned long Size = Cache.Head().PackageCount;

    memset(Scores,0,sizeof(*Scores)*Size);
 
    // Generate the base scores for a package based on its properties
    memset(Scores,0,sizeof(*Scores)*Size);
 
    // Generate the base scores for a package based on its properties


@@ -415,7 +525,7 @@ void pkgProblemResolver::MakeScores()
    }   
    
    // Copy the scores to advoid additive looping
    }   
    
    // Copy the scores to advoid additive looping

-   signed short *OldScores = new signed short[Size];
+   SPtrArray<signed short> OldScores = new signed short[Size];

    memcpy(OldScores,Scores,sizeof(*Scores)*Size);
       
    /* Now we cause 1 level of dependency inheritance, that is we add the 
    memcpy(OldScores,Scores,sizeof(*Scores)*Size);
       
    /* Now we cause 1 level of dependency inheritance, that is we add the 


@@ -458,9 +568,7 @@ void pkgProblemResolver::MakeScores()
         Scores[I->ID] += 10000;
       if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
         Scores[I->ID] += 5000;
         Scores[I->ID] += 10000;
       if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
         Scores[I->ID] += 5000;

-   }
-   
-   delete [] OldScores;
+   }   

 }
                                                                        /*}}}*/
 // ProblemResolver::DoUpgrade - Attempt to upgrade this package                /*{{{*/
 }
                                                                        /*}}}*/
 // ProblemResolver::DoUpgrade - Attempt to upgrade this package                /*{{{*/


@@ -469,13 +577,17 @@ void pkgProblemResolver::MakeScores()
    installable */
 bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
 {
    installable */
 bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
 {

+   pkgDepCache::ActionGroup group(Cache);
+

    if ((Flags[Pkg->ID] & Upgradable) == 0 || Cache[Pkg].Upgradable() == false)
       return false;
    if ((Flags[Pkg->ID] & Upgradable) == 0 || Cache[Pkg].Upgradable() == false)
       return false;

+   if ((Flags[Pkg->ID] & Protected) == Protected)
+      return false;

    
    Flags[Pkg->ID] &= ~Upgradable;
    
    bool WasKept = Cache[Pkg].Keep();
    
    Flags[Pkg->ID] &= ~Upgradable;
    
    bool WasKept = Cache[Pkg].Keep();

-   Cache.MarkInstall(Pkg,false);
+   Cache.MarkInstall(Pkg, false, 0, false);

 
    // This must be a virtual package or something like that.
    if (Cache[Pkg].InstVerIter(Cache).end() == true)
 
    // This must be a virtual package or something like that.
    if (Cache[Pkg].InstVerIter(Cache).end() == true)


@@ -489,10 +601,11 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
       pkgCache::DepIterator Start = D;
       pkgCache::DepIterator End = D;
       unsigned char State = 0;
       pkgCache::DepIterator Start = D;
       pkgCache::DepIterator End = D;
       unsigned char State = 0;

-      for (bool LastOR = true; D.end() == false && LastOR == true; D++)
+      for (bool LastOR = true; D.end() == false && LastOR == true;)

       {
         State |= Cache[D];
         LastOR = (D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;
       {
         State |= Cache[D];
         LastOR = (D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;

+        D++;

         if (LastOR == true)
            End = D;
       }
         if (LastOR == true)
            End = D;
       }


@@ -500,59 +613,66 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
       // We only worry about critical deps.
       if (End.IsCritical() != true)
         continue;
       // We only worry about critical deps.
       if (End.IsCritical() != true)
         continue;

-      
-      // Dep is ok
-      if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
-        continue;
-      
-      // Hm, the group is broken.. I have no idea how to handle this
-      if (Start != End)
-      {
-        clog << "Note, a broken or group was found in " << Pkg.Name() << "." << endl;
-        Fail = true;
-        break;
-      }
-
-      // Do not change protected packages
-      PkgIterator P = Start.SmartTargetPkg();
-      if ((Flags[P->ID] & Protected) == Protected)
+            
+      // Iterate over all the members in the or group
+      while (1)

       {
       {

-        if (Debug == true)
-           clog << "    Reinet Failed because of protected " << P.Name() << endl;
-        Fail = true;
-        break;
-      }      
-      
-      // Upgrade the package if the candidate version will fix the problem.
-      if ((Cache[Start] & pkgDepCache::DepCVer) == pkgDepCache::DepCVer)
-      {
-        if (DoUpgrade(P) == false)
+        // Dep is ok now
+        if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
+           break;
+        
+        // Do not change protected packages
+        PkgIterator P = Start.SmartTargetPkg();
+        if ((Flags[P->ID] & Protected) == Protected)

         {
            if (Debug == true)
         {
            if (Debug == true)

-              clog << "    Reinst Failed because of " << P.Name() << endl;
+              clog << "    Reinst Failed because of protected " << P.Name() << endl;

            Fail = true;
            Fail = true;

+        }      
+        else
+        {
+           // Upgrade the package if the candidate version will fix the problem.
+           if ((Cache[Start] & pkgDepCache::DepCVer) == pkgDepCache::DepCVer)
+           {
+              if (DoUpgrade(P) == false)
+              {
+                 if (Debug == true)
+                    clog << "    Reinst Failed because of " << P.Name() << endl;
+                 Fail = true;
+              }
+              else
+              {
+                 Fail = false;
+                 break;
+              }            
+           }
+           else
+           {
+              /* We let the algorithm deal with conflicts on its next iteration,
+               it is much smarter than us */
+              if (Start->Type == pkgCache::Dep::Conflicts || 
+                  Start->Type == pkgCache::Dep::Obsoletes)
+                  break;
+              
+              if (Debug == true)
+                 clog << "    Reinst Failed early because of " << Start.TargetPkg().Name() << endl;
+              Fail = true;
+           }     
+        }
+        
+        if (Start == End)

            break;
            break;

-        }       
+        Start++;

       }
       }

-      else
-      {
-        /* We let the algorithm deal with conflicts on its next iteration,
-           it is much smarter than us */
-        if (End->Type == pkgCache::Dep::Conflicts)
-           continue;
-        
-        if (Debug == true)
-           clog << "    Reinst Failed early because of " << Start.TargetPkg().Name() << endl;
-        Fail = true;
+      if (Fail == true)

         break;
         break;

-      }      

    }
    
    // Undo our operations - it might be smart to undo everything this did..
    if (Fail == true)
    {
       if (WasKept == true)
    }
    
    // Undo our operations - it might be smart to undo everything this did..
    if (Fail == true)
    {
       if (WasKept == true)

-        Cache.MarkKeep(Pkg);
+        Cache.MarkKeep(Pkg, false, false);

       else
         Cache.MarkDelete(Pkg);
       return false;
       else
         Cache.MarkDelete(Pkg);
       return false;


@@ -579,7 +699,9 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
    upgrade packages to advoid problems. */
 bool pkgProblemResolver::Resolve(bool BrokenFix)
 {
    upgrade packages to advoid problems. */
 bool pkgProblemResolver::Resolve(bool BrokenFix)
 {

-   unsigned long Size = Cache.HeaderP->PackageCount;
+   pkgDepCache::ActionGroup group(Cache);
+
+   unsigned long Size = Cache.Head().PackageCount;

 
    // Record which packages are marked for install
    bool Again = false;
 
    // Record which packages are marked for install
    bool Again = false;


@@ -594,7 +716,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
         {
            if (Cache[I].InstBroken() == true && BrokenFix == true)
            {
         {
            if (Cache[I].InstBroken() == true && BrokenFix == true)
            {

-              Cache.MarkInstall(I,false);
+              Cache.MarkInstall(I, false, 0, false);

               if (Cache[I].Install() == true)
                  Again = true;
            }
               if (Cache[I].Install() == true)
                  Again = true;
            }


@@ -615,7 +737,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
       operates from highest score to lowest. This prevents problems when
       high score packages cause the removal of lower score packages that
       would cause the removal of even lower score packages. */
       operates from highest score to lowest. This prevents problems when
       high score packages cause the removal of lower score packages that
       would cause the removal of even lower score packages. */

-   pkgCache::Package **PList = new pkgCache::Package *[Size];
+   SPtrArray<pkgCache::Package *> PList = new pkgCache::Package *[Size];

    pkgCache::Package **PEnd = PList;
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       *PEnd++ = I;
    pkgCache::Package **PEnd = PList;
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       *PEnd++ = I;


@@ -660,14 +782,14 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
            pkgCache::Version *OldVer = Cache[I].InstallVer;
            Flags[I->ID] &= ReInstateTried;
            
            pkgCache::Version *OldVer = Cache[I].InstallVer;
            Flags[I->ID] &= ReInstateTried;
            

-           Cache.MarkInstall(I,false);
+           Cache.MarkInstall(I, false, 0, false);

            if (Cache[I].InstBroken() == true || 
                OldBreaks < Cache.BrokenCount())
            {
               if (OldVer == 0)
                  Cache.MarkDelete(I);
               else
            if (Cache[I].InstBroken() == true || 
                OldBreaks < Cache.BrokenCount())
            {
               if (OldVer == 0)
                  Cache.MarkDelete(I);
               else

-                 Cache.MarkKeep(I);
+                 Cache.MarkKeep(I, false, false);

            }       
            else
               if (Debug == true)
            }       
            else
               if (Debug == true)


@@ -677,46 +799,92 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
         if (Cache[I].InstallVer == 0 || Cache[I].InstBroken() == false)
            continue;
         
         if (Cache[I].InstallVer == 0 || Cache[I].InstBroken() == false)
            continue;
         

+        if (Debug == true)
+           cout << "Investigating " << I.Name() << endl;
+        

         // Isolate the problem dependency
         PackageKill KillList[100];
         PackageKill *LEnd = KillList;
         // Isolate the problem dependency
         PackageKill KillList[100];
         PackageKill *LEnd = KillList;

-        for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false;)
+        bool InOr = false;
+        pkgCache::DepIterator Start;
+        pkgCache::DepIterator End;
+        PackageKill *OldEnd = LEnd;
+        
+        enum {OrRemove,OrKeep} OrOp = OrRemove;
+        for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList();
+             D.end() == false || InOr == true;)

         {
            // Compute a single dependency element (glob or)
         {
            // Compute a single dependency element (glob or)

-           pkgCache::DepIterator Start;
-           pkgCache::DepIterator End;
-           D.GlobOr(Start,End);
-           
-           // We only worry about critical deps.
-           if (End.IsCritical() != true)
-              continue;
-           
+           if (Start == End)
+           {
+              // Decide what to do
+              if (InOr == true)
+              {
+                 if (OldEnd == LEnd && OrOp == OrRemove)
+                 {
+                    if ((Flags[I->ID] & Protected) != Protected)
+                    {
+                       if (Debug == true)
+                          clog << "  Or group remove for " << I.Name() << endl;
+                       Cache.MarkDelete(I);
+                       Change = true;
+                    }               
+                 }               
+                 if (OldEnd == LEnd && OrOp == OrKeep)
+                 {
+                    if (Debug == true)
+                       clog << "  Or group keep for " << I.Name() << endl;
+                    Cache.MarkKeep(I, false, false);
+                    Change = true;
+                 }
+              }
+              
+              /* We do an extra loop (as above) to finalize the or group
+                 processing */
+              InOr = false;
+              OrOp = OrRemove;
+              D.GlobOr(Start,End);
+              if (Start.end() == true)
+                 break;
+
+              // We only worry about critical deps.
+              if (End.IsCritical() != true)
+                 continue;
+
+              InOr = Start != End;
+              OldEnd = LEnd;
+           }
+           else
+              Start++;
+

            // Dep is ok
            if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
            // Dep is ok
            if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)

-              continue;
-           
-           // Hm, the group is broken.. I have no idea how to handle this
-           if (Start != End)

            {
            {

-              if (Debug == true)
-                 clog << "Note, a broken or group was found in " << I.Name() << "." << endl;
-              Cache.MarkDelete(I);
-              break;
+              InOr = false;
+              continue;

            }
            }

-                   
+           

            if (Debug == true)
            if (Debug == true)

-              clog << "Package " << I.Name() << " has broken dep on " << End.TargetPkg().Name() << endl;
+              clog << "Package " << I.Name() << " has broken dep on " << Start.TargetPkg().Name() << endl;

 
            /* Look across the version list. If there are no possible
               targets then we keep the package and bail. This is necessary
               if a package has a dep on another package that cant be found */
 
            /* Look across the version list. If there are no possible
               targets then we keep the package and bail. This is necessary
               if a package has a dep on another package that cant be found */

-           pkgCache::Version **VList = End.AllTargets();
+           SPtrArray<pkgCache::Version *> VList = Start.AllTargets();

            if (*VList == 0 && (Flags[I->ID] & Protected) != Protected &&
            if (*VList == 0 && (Flags[I->ID] & Protected) != Protected &&

-               End->Type != pkgCache::Dep::Conflicts && 
+               Start->Type != pkgCache::Dep::Conflicts &&
+               Start->Type != pkgCache::Dep::Obsoletes &&

                Cache[I].NowBroken() == false)
                Cache[I].NowBroken() == false)

-           {
+           {          
+              if (InOr == true)
+              {
+                 /* No keep choice because the keep being OK could be the
+                    result of another element in the OR group! */
+                 continue;
+              }
+              

               Change = true;
               Change = true;

-              Cache.MarkKeep(I);
+              Cache.MarkKeep(I, false, false);

               break;
            }
            
               break;
            }
            


@@ -725,116 +893,203 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
            {
               pkgCache::VerIterator Ver(Cache,*V);
               pkgCache::PkgIterator Pkg = Ver.ParentPkg();
            {
               pkgCache::VerIterator Ver(Cache,*V);
               pkgCache::PkgIterator Pkg = Ver.ParentPkg();

-           
+

               if (Debug == true)
               if (Debug == true)

-                 clog << "  Considering " << Pkg.Name() << ' ' << (int)Scores[Pkg->ID] << 
+                 clog << "  Considering " << Pkg.Name() << ' ' << (int)Scores[Pkg->ID] <<

                  " as a solution to " << I.Name() << ' ' << (int)Scores[I->ID] << endl;
                  " as a solution to " << I.Name() << ' ' << (int)Scores[I->ID] << endl;

+
+              /* Try to fix the package under consideration rather than
+                 fiddle with the VList package */

               if (Scores[I->ID] <= Scores[Pkg->ID] ||
               if (Scores[I->ID] <= Scores[Pkg->ID] ||

-                  ((Cache[End] & pkgDepCache::DepGNow) == 0 &&
-                   End->Type != pkgCache::Dep::Conflicts))
+                  ((Cache[Start] & pkgDepCache::DepNow) == 0 &&
+                   End->Type != pkgCache::Dep::Conflicts &&
+                   End->Type != pkgCache::Dep::Obsoletes))

               {
               {

+                 // Try a little harder to fix protected packages..

                  if ((Flags[I->ID] & Protected) == Protected)
                  if ((Flags[I->ID] & Protected) == Protected)

+                 {
+                    if (DoUpgrade(Pkg) == true)
+                    {
+                       if (Scores[Pkg->ID] > Scores[I->ID])
+                          Scores[Pkg->ID] = Scores[I->ID];
+                       break;
+                    }
+                    

                     continue;
                     continue;

-
-                 // See if a keep will do
-                 Cache.MarkKeep(I);
+                 }
+                 
+                 /* See if a keep will do, unless the package is protected,
+                    then installing it will be necessary */
+                 bool Installed = Cache[I].Install();
+                 Cache.MarkKeep(I, false, false);

                  if (Cache[I].InstBroken() == false)
                  {
                  if (Cache[I].InstBroken() == false)
                  {

+                    // Unwind operation will be keep now
+                    if (OrOp == OrRemove)
+                       OrOp = OrKeep;
+                    
+                    // Restore
+                    if (InOr == true && Installed == true)
+                       Cache.MarkInstall(I, false, 0, false);
+                    

                     if (Debug == true)
                     if (Debug == true)

-                       clog << "  Holding Back " << I.Name() << " rather than change " << End.TargetPkg().Name() << endl;
+                       clog << "  Holding Back " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl;

                  }               
                  else
                  }               
                  else

-                 {
+                 {                  

                     if (BrokenFix == false || DoUpgrade(I) == false)
                     {
                     if (BrokenFix == false || DoUpgrade(I) == false)
                     {

-                       if (Debug == true)
-                          clog << "  Removing " << I.Name() << " rather than change " << End.TargetPkg().Name() << endl;
-                       Cache.MarkDelete(I);
-                       if (Counter > 1)
-                          Scores[I->ID] = Scores[Pkg->ID];
+                       // Consider other options
+                       if (InOr == false)
+                       {
+                          if (Debug == true)
+                             clog << "  Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl;
+                          Cache.MarkDelete(I);
+                          if (Counter > 1)
+                          {
+                             if (Scores[Pkg->ID] > Scores[I->ID])
+                                Scores[I->ID] = Scores[Pkg->ID];
+                          }                       
+                       }                       

                     }
                  }
                     }
                  }

-
+                                 

                  Change = true;
                  Done = true;
                  break;
               }
               else
               {
                  Change = true;
                  Done = true;
                  break;
               }
               else
               {

-                 // Skip this if it is protected
+                 /* This is a conflicts, and the version we are looking
+                    at is not the currently selected version of the 
+                    package, which means it is not necessary to 
+                    remove/keep */
+                 if (Cache[Pkg].InstallVer != Ver &&
+                     (Start->Type == pkgCache::Dep::Conflicts ||
+                      Start->Type == pkgCache::Dep::Obsoletes))
+                    continue;
+                 
+                 // Skip adding to the kill list if it is protected

                  if ((Flags[Pkg->ID] & Protected) != 0)
                     continue;
                  if ((Flags[Pkg->ID] & Protected) != 0)
                     continue;

+               
+                 if (Debug == true)
+                    clog << "  Added " << Pkg.Name() << " to the remove list" << endl;

                  
                  LEnd->Pkg = Pkg;
                  LEnd->Dep = End;
                  LEnd++;
                  
                  
                  LEnd->Pkg = Pkg;
                  LEnd->Dep = End;
                  LEnd++;
                  

-                 if (End->Type != pkgCache::Dep::Conflicts)
+                 if (Start->Type != pkgCache::Dep::Conflicts &&
+                     Start->Type != pkgCache::Dep::Obsoletes)

                     break;
               }
            }
 
            // Hm, nothing can possibly satisify this dep. Nuke it.
                     break;
               }
            }
 
            // Hm, nothing can possibly satisify this dep. Nuke it.

-           if (VList[0] == 0 && End->Type != pkgCache::Dep::Conflicts &&
+           if (VList[0] == 0 && 
+               Start->Type != pkgCache::Dep::Conflicts &&
+               Start->Type != pkgCache::Dep::Obsoletes &&

                (Flags[I->ID] & Protected) != Protected)
            {
                (Flags[I->ID] & Protected) != Protected)
            {

+              bool Installed = Cache[I].Install();

               Cache.MarkKeep(I);
               if (Cache[I].InstBroken() == false)
               {
               Cache.MarkKeep(I);
               if (Cache[I].InstBroken() == false)
               {

+                 // Unwind operation will be keep now
+                 if (OrOp == OrRemove)
+                    OrOp = OrKeep;
+                 
+                 // Restore
+                 if (InOr == true && Installed == true)
+                    Cache.MarkInstall(I, false, 0, false);
+                 

                  if (Debug == true)
                  if (Debug == true)

-                    clog << "  Holding Back " << I.Name() << " because I can't find " << End.TargetPkg().Name() << endl;
+                    clog << "  Holding Back " << I.Name() << " because I can't find " << Start.TargetPkg().Name() << endl;

               }               
               else
               {
                  if (Debug == true)
               }               
               else
               {
                  if (Debug == true)

-                    clog << "  Removing " << I.Name() << " because I can't find " << End.TargetPkg().Name() << endl;
-                 Cache.MarkDelete(I);
+                    clog << "  Removing " << I.Name() << " because I can't find " << Start.TargetPkg().Name() << endl;
+                 if (InOr == false)
+                    Cache.MarkDelete(I);

               }
 
               Change = true;
               Done = true;
            }
            
               }
 
               Change = true;
               Done = true;
            }
            

-           delete [] VList;
+           // Try some more
+           if (InOr == true)
+              continue;
+           

            if (Done == true)
               break;
         }
         
         // Apply the kill list now
         if (Cache[I].InstallVer != 0)
            if (Done == true)
               break;
         }
         
         // Apply the kill list now
         if (Cache[I].InstallVer != 0)

+        {

            for (PackageKill *J = KillList; J != LEnd; J++)
            for (PackageKill *J = KillList; J != LEnd; J++)

-         {
-           Change = true;
-           if ((Cache[J->Dep] & pkgDepCache::DepGNow) == 0)

            {
            {

-              if (J->Dep->Type == pkgCache::Dep::Conflicts)
+              Change = true;
+              if ((Cache[J->Dep] & pkgDepCache::DepGNow) == 0)
+              {
+                 if (J->Dep->Type == pkgCache::Dep::Conflicts || 
+                     J->Dep->Type == pkgCache::Dep::Obsoletes)
+                 {
+                    if (Debug == true)
+                       clog << "  Fixing " << I.Name() << " via remove of " << J->Pkg.Name() << endl;
+                    Cache.MarkDelete(J->Pkg);
+                 }
+              }
+              else

               {
                  if (Debug == true)
               {
                  if (Debug == true)

-                    clog << "  Fixing " << I.Name() << " via remove of " << J->Pkg.Name() << endl;
-                 Cache.MarkDelete(J->Pkg);
+                    clog << "  Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl;
+                 Cache.MarkKeep(J->Pkg, false, false);

               }
               }

-           }
-           else
-           {
-              if (Debug == true)
-                 clog << "  Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl;
-              Cache.MarkKeep(J->Pkg);
-           }
-           
-           if (Counter > 1)
-              Scores[J->Pkg->ID] = Scores[I->ID];
-        }      
-      }
+
+              if (Counter > 1)
+              {
+                 if (Scores[I->ID] > Scores[J->Pkg->ID])                 
+                    Scores[J->Pkg->ID] = Scores[I->ID];
+              }               
+           }      
+        }
+      }      

    }
 
    if (Debug == true)
       clog << "Done" << endl;
    }
 
    if (Debug == true)
       clog << "Done" << endl;

-   
-   delete [] Scores;
-   delete [] PList;
-   
+      

    if (Cache.BrokenCount() != 0)
    if (Cache.BrokenCount() != 0)

-      return _error->Error("Internal error, pkgProblemResolver::Resolve generated breaks.");
+   {
+      // See if this is the result of a hold
+      pkgCache::PkgIterator I = Cache.PkgBegin();
+      for (;I.end() != true; I++)
+      {
+        if (Cache[I].InstBroken() == false)
+           continue;
+        if ((Flags[I->ID] & Protected) != Protected)
+           return _error->Error(_("Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages."));
+      }
+      return _error->Error(_("Unable to correct problems, you have held broken packages."));
+   }
+   
+   // set the auto-flags (mvo: I'm not sure if we _really_ need this, but
+   // I didn't managed 
+   pkgCache::PkgIterator I = Cache.PkgBegin();
+   for (;I.end() != true; I++) {
+      if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) {
+        if(_config->FindI("Debug::pkgAutoRemove",false)) {
+           std::clog << "Resolve installed new pkg: " << I.Name() 
+                     << " (now marking it as auto)" << std::endl;
+        }
+        Cache[I].Flags |= pkgCache::Flag::Auto;
+      }
+   }
+

 
    return true;
 }
 
    return true;
 }


@@ -846,7 +1101,9 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
    system was non-broken previously. */
 bool pkgProblemResolver::ResolveByKeep()
 {
    system was non-broken previously. */
 bool pkgProblemResolver::ResolveByKeep()
 {

-   unsigned long Size = Cache.HeaderP->PackageCount;
+   pkgDepCache::ActionGroup group(Cache);
+
+   unsigned long Size = Cache.Head().PackageCount;

 
    if (Debug == true)      
       clog << "Entering ResolveByKeep" << endl;
 
    if (Debug == true)      
       clog << "Entering ResolveByKeep" << endl;


@@ -874,15 +1131,15 @@ bool pkgProblemResolver::ResolveByKeep()
         continue;
 
       /* Keep the package. If this works then great, otherwise we have
         continue;
 
       /* Keep the package. If this works then great, otherwise we have

-                to be significantly more agressive and manipulate its dependencies */      
+                to be significantly more agressive and manipulate its dependencies */

       if ((Flags[I->ID] & Protected) == 0)
       {
         if (Debug == true)
            clog << "Keeping package " << I.Name() << endl;
       if ((Flags[I->ID] & Protected) == 0)
       {
         if (Debug == true)
            clog << "Keeping package " << I.Name() << endl;

-        Cache.MarkKeep(I);
+        Cache.MarkKeep(I, false, false);

         if (Cache[I].InstBroken() == false)
         {
         if (Cache[I].InstBroken() == false)
         {

-           K = PList;
+           K = PList - 1;

            continue;
         }
       }
            continue;
         }
       }


@@ -890,18 +1147,10 @@ bool pkgProblemResolver::ResolveByKeep()
       // Isolate the problem dependencies
       for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false;)
       {
       // Isolate the problem dependencies
       for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false;)
       {

-        // Compute a single dependency element (glob or)
-        pkgCache::DepIterator Start = D;
-        pkgCache::DepIterator End = D;
-        unsigned char State = 0;
-        for (bool LastOR = true; D.end() == false && LastOR == true; D++)
-        {
-           State |= Cache[D];
-           LastOR = (D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;
-           if (LastOR == true)
-              End = D;
-        }
-        
+        DepIterator Start;
+        DepIterator End;
+        D.GlobOr(Start,End);
+

         // We only worry about critical deps.
         if (End.IsCritical() != true)
            continue;
         // We only worry about critical deps.
         if (End.IsCritical() != true)
            continue;


@@ -909,42 +1158,47 @@ bool pkgProblemResolver::ResolveByKeep()
         // Dep is ok
         if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
            continue;
         // Dep is ok
         if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
            continue;

-        
-        // Hm, the group is broken.. I have no idea how to handle this
-        if (Start != End)
-        {
-           clog << "Note, a broken or group was found in " << I.Name() << "." << endl;
-           if ((Flags[I->ID] & Protected) == 0)
-              Cache.MarkKeep(I);
-           break;
-        }
-        
-        if (Debug == true)
-           clog << "Package " << I.Name() << " has broken dep on " << End.TargetPkg().Name() << endl;
-        
-        // Look at all the possible provides on this package
-        pkgCache::Version **VList = End.AllTargets();
-        for (pkgCache::Version **V = VList; *V != 0; V++)
+
+        /* Hm, the group is broken.. I suppose the best thing to do is to
+           is to try every combination of keep/not-keep for the set, but thats
+           slow, and this never happens, just be conservative and assume the
+           list of ors is in preference and keep till it starts to work. */
+        while (true)

         {
         {

-           pkgCache::VerIterator Ver(Cache,*V);
-           pkgCache::PkgIterator Pkg = Ver.ParentPkg();
-           
-           // It is not keepable
-           if (Cache[Pkg].InstallVer == 0 || 
-               Pkg->CurrentVer == 0)
-              continue;
+           if (Debug == true)
+              clog << "Package " << I.Name() << " has broken dep on " << Start.TargetPkg().Name() << endl;

            
            

-           if ((Flags[I->ID] & Protected) == 0)
+           // Look at all the possible provides on this package
+           SPtrArray<pkgCache::Version *> VList = Start.AllTargets();
+           for (pkgCache::Version **V = VList; *V != 0; V++)

            {
            {

-              if (Debug == true)
-                 clog << "  Keeping Package " << Pkg.Name() << " due to dep" << endl;
-              Cache.MarkKeep(Pkg);
+              pkgCache::VerIterator Ver(Cache,*V);
+              pkgCache::PkgIterator Pkg = Ver.ParentPkg();
+              
+              // It is not keepable
+              if (Cache[Pkg].InstallVer == 0 ||
+                  Pkg->CurrentVer == 0)
+                 continue;
+              
+              if ((Flags[I->ID] & Protected) == 0)
+              {
+                 if (Debug == true)
+                    clog << "  Keeping Package " << Pkg.Name() << " due to dep" << endl;
+                 Cache.MarkKeep(Pkg, false, false);
+              }
+              
+              if (Cache[I].InstBroken() == false)
+                 break;

            }
            
            if (Cache[I].InstBroken() == false)
               break;
            }
            
            if (Cache[I].InstBroken() == false)
               break;

-        }

 
 

+           if (Start == End)
+              break;
+           Start++;
+        }
+             

         if (Cache[I].InstBroken() == false)
            break;
       }
         if (Cache[I].InstBroken() == false)
            break;
       }


@@ -956,7 +1210,7 @@ bool pkgProblemResolver::ResolveByKeep()
       if (K == LastStop)
         return _error->Error("Internal Error, pkgProblemResolver::ResolveByKeep is looping on package %s.",I.Name());
       LastStop = K;
       if (K == LastStop)
         return _error->Error("Internal Error, pkgProblemResolver::ResolveByKeep is looping on package %s.",I.Name());
       LastStop = K;

-      K = PList;
+      K = PList - 1;

    }   
 
    return true;
    }   
 
    return true;


@@ -967,6 +1221,8 @@ bool pkgProblemResolver::ResolveByKeep()
 /* This is used to make sure protected packages are installed */
 void pkgProblemResolver::InstallProtect()
 {
 /* This is used to make sure protected packages are installed */
 void pkgProblemResolver::InstallProtect()
 {

+   pkgDepCache::ActionGroup group(Cache);
+

    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
       if ((Flags[I->ID] & Protected) == Protected)
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
       if ((Flags[I->ID] & Protected) == Protected)


@@ -974,8 +1230,40 @@ void pkgProblemResolver::InstallProtect()
         if ((Flags[I->ID] & ToRemove) == ToRemove)
            Cache.MarkDelete(I);
         else
         if ((Flags[I->ID] & ToRemove) == ToRemove)
            Cache.MarkDelete(I);
         else

-           Cache.MarkInstall(I,false);
+           Cache.MarkInstall(I, false, 0, false);

       }
    }   
 }
                                                                        /*}}}*/
       }
    }   
 }
                                                                        /*}}}*/

+
+// PrioSortList - Sort a list of versions by priority                  /*{{{*/
+// ---------------------------------------------------------------------
+/* This is ment to be used in conjunction with AllTargets to get a list 
+   of versions ordered by preference. */
+static pkgCache *PrioCache;
+static int PrioComp(const void *A,const void *B)
+{
+   pkgCache::VerIterator L(*PrioCache,*(pkgCache::Version **)A);
+   pkgCache::VerIterator R(*PrioCache,*(pkgCache::Version **)B);
+   
+   if ((L.ParentPkg()->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential &&
+       (R.ParentPkg()->Flags & pkgCache::Flag::Essential) != pkgCache::Flag::Essential)
+     return 1;
+   if ((L.ParentPkg()->Flags & pkgCache::Flag::Essential) != pkgCache::Flag::Essential &&
+       (R.ParentPkg()->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
+     return -1;
+   
+   if (L->Priority != R->Priority)
+      return R->Priority - L->Priority;
+   return strcmp(L.ParentPkg().Name(),R.ParentPkg().Name());
+}
+void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List)
+{
+   unsigned long Count = 0;
+   PrioCache = &Cache;
+   for (pkgCache::Version **I = List; *I != 0; I++)
+      Count++;
+   qsort(List,Count,sizeof(*List),PrioComp);
+}
+                                                                       /*}}}*/
+