* add --dsc-only option, thanks to K. Richard Pixley

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

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index e784ce895babf6a1c2fee8bc29b49e98ac13153a..c6583f3b59e324277faf909e324fd2715481e266 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.27 1999/10/22 05:58:54 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,26 +20,63 @@
 #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/sptr.h>
+    
+#include <apti18n.h>
+    
+#include <cstdlib>
+#include <algorithm>
+#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)

 {
 {

-   Flags = new unsigned char[Cache.HeaderP->PackageCount];
-   memset(Flags,0,sizeof(*Flags)*Cache.HeaderP->PackageCount);
+   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";
 
    // Fake a filename so as not to activate the media swapping
    string Jnk = "SIMULATE";

-   for (unsigned int I = 0; I != Cache.Head().PackageCount; I++)
+   for (unsigned int I = 0; I != Cache->Head().PackageCount; I++)

       FileNames[I] = Jnk;
 }
                                                                        /*}}}*/
       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)
+{
+   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                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -49,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.


@@ -58,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)


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


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


@@ -133,9 +183,10 @@ bool pkgSimulate::Remove(PkgIterator iPkg,bool Purge)
    Flags[Pkg->ID] = 3;
    Sim.MarkDelete(Pkg);
    if (Purge == true)
    Flags[Pkg->ID] = 3;
    Sim.MarkDelete(Pkg);
    if (Purge == true)

-      cout << "Purg " << Pkg.Name();
+      cout << "Purg ";

    else
    else

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

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


@@ -173,20 +224,24 @@ bool pkgApplyStatus(pkgDepCache &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)
       {

-        if (I.CurrentVer().Downloadable() == true)
+        if (I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true)

            Cache.MarkKeep(I);
         else
         {
            // Is this right? Will dpkg choke on an upgrade?
            Cache.MarkKeep(I);
         else
         {
            // Is this right? Will dpkg choke on an upgrade?

-           if (Cache[I].CandidateVerIter(Cache).Downloadable() == true)
+           if (Cache[I].CandidateVer != 0 &&
+                Cache[I].CandidateVerIter(Cache).Downloadable() == true)

               Cache.MarkInstall(I);
            else
               Cache.MarkInstall(I);
            else

-              return _error->Error("The package %s needs to be reinstalled, "
-                                   "but I can't find an archive for it.",I.Name());
+              return _error->Error(_("The package %s needs to be reinstalled, "
+                                   "but I can't find an archive for it."),I.Name());

         }
         
         continue;
         }
         
         continue;


@@ -198,12 +253,13 @@ bool pkgApplyStatus(pkgDepCache &Cache)
            re-unpacked (probably) */
         case pkgCache::State::UnPacked:
         case pkgCache::State::HalfConfigured:
            re-unpacked (probably) */
         case pkgCache::State::UnPacked:
         case pkgCache::State::HalfConfigured:

-        if (I.CurrentVer().Downloadable() == true || 
+        if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) ||

             I.State() != pkgCache::PkgIterator::NeedsUnpack)
            Cache.MarkKeep(I);
         else
         {
             I.State() != pkgCache::PkgIterator::NeedsUnpack)
            Cache.MarkKeep(I);
         else
         {

-           if (Cache[I].CandidateVerIter(Cache).Downloadable() == true)
+           if (Cache[I].CandidateVer != 0 &&
+                Cache[I].CandidateVerIter(Cache).Downloadable() == true)

               Cache.MarkInstall(I);
            else
               Cache.MarkDelete(I);
               Cache.MarkInstall(I);
            else
               Cache.MarkDelete(I);


@@ -249,7 +305,7 @@ bool pkgFixBroken(pkgDepCache &Cache)
       Cache.MarkInstall(I,true);      
    }
    
       Cache.MarkInstall(I,true);      
    }
    

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

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


@@ -281,10 +337,10 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
       if (I->CurrentVer != 0)
         Cache.MarkInstall(I,false);
 
       if (I->CurrentVer != 0)
         Cache.MarkInstall(I,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++)
       {
    {
       for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       {


@@ -306,7 +362,7 @@ 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);
+   pkgProblemResolver Fix(&Cache);

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


@@ -317,7 +373,7 @@ 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->SelectedState == pkgCache::State::Hold)
            continue;
       


@@ -338,7 +394,7 @@ bool pkgMinimizeUpgrade(pkgDepCache &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;
    unsigned int Count = 0;
    do
    bool Change = false;
    unsigned int Count = 0;
    do


@@ -375,10 +431,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);


@@ -387,6 +443,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                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -406,7 +471,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


@@ -431,8 +496,10 @@ void pkgProblemResolver::MakeScores()
         Score += PrioMap[Cache[I].InstVerIter(Cache)->Priority];
       
       /* This helps to fix oddball problems with conflicting packages
         Score += PrioMap[Cache[I].InstVerIter(Cache)->Priority];
       
       /* This helps to fix oddball problems with conflicting packages

-         on the same level. We enhance the score of installed packages */
-      if (I->CurrentVer != 0)
+         on the same level. We enhance the score of installed packages 
+        if those are not obsolete
+      */
+      if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable())

         Score += 1;
    }
 
         Score += 1;
    }
 


@@ -450,7 +517,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 


@@ -493,9 +560,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                /*{{{*/


@@ -506,6 +571,8 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
 {
    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;
    
    
    Flags[Pkg->ID] &= ~Upgradable;
    


@@ -573,8 +640,9 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
            {
               /* We let the algorithm deal with conflicts on its next iteration,
                it is much smarter than us */
            {
               /* We let the algorithm deal with conflicts on its next iteration,
                it is much smarter than us */

-              if (Start->Type == pkgCache::Dep::Conflicts)
-                 break;
+              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;
               
               if (Debug == true)
                  clog << "    Reinst Failed early because of " << Start.TargetPkg().Name() << endl;


@@ -621,7 +689,7 @@ 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;
+   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;


@@ -657,7 +725,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;


@@ -719,13 +787,16 @@ 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)
+           clog << "Investigating " << I.Name() << endl;
+        

         // Isolate the problem dependency
         PackageKill KillList[100];
         PackageKill *LEnd = KillList;
         bool InOr = false;
         pkgCache::DepIterator Start;
         pkgCache::DepIterator End;
         // Isolate the problem dependency
         PackageKill KillList[100];
         PackageKill *LEnd = KillList;
         bool InOr = false;
         pkgCache::DepIterator Start;
         pkgCache::DepIterator End;

-        PackageKill *OldEnd;
+        PackageKill *OldEnd = LEnd;

         
         enum {OrRemove,OrKeep} OrOp = OrRemove;
         for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList();
         
         enum {OrRemove,OrKeep} OrOp = OrRemove;
         for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList();


@@ -738,36 +809,64 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
               if (InOr == true)
               {
                  if (OldEnd == LEnd && OrOp == OrRemove)
               if (InOr == true)
               {
                  if (OldEnd == LEnd && OrOp == OrRemove)

-                    Cache.MarkDelete(I);
+                 {
+                    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 (OldEnd == LEnd && OrOp == OrKeep)

+                 {
+                    if (Debug == true)
+                       clog << "  Or group keep for " << I.Name() << endl;

                     Cache.MarkKeep(I);
                     Cache.MarkKeep(I);

+                    Change = true;
+                 }

               }
               
               }
               

+              /* We do an extra loop (as above) to finalize the or group
+                 processing */
+              InOr = false;

               OrOp = OrRemove;
               D.GlobOr(Start,End);
               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;
               InOr = Start != End;
               OldEnd = LEnd;

-           }       
+           }

            else
            else

+            {

               Start++;
               Start++;

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

 
 

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

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

+           {
+              InOr = false;

               continue;
               continue;

-                   
+           }
+           

            if (Debug == true)
               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 */
            if (Debug == true)
               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 */

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

            if (*VList == 0 && (Flags[I->ID] & Protected) != Protected &&
                Start->Type != pkgCache::Dep::Conflicts &&
            if (*VList == 0 && (Flags[I->ID] & Protected) != Protected &&
                Start->Type != pkgCache::Dep::Conflicts &&

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

                Cache[I].NowBroken() == false)
            {          
               if (InOr == true)
                Cache[I].NowBroken() == false)
            {          
               if (InOr == true)


@@ -787,19 +886,28 @@ 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)
                  clog << "  Considering " << Pkg.Name() << ' ' << (int)Scores[Pkg->ID] <<
                  " as a solution to " << I.Name() << ' ' << (int)Scores[I->ID] << endl;
               if (Debug == true)
                  clog << "  Considering " << Pkg.Name() << ' ' << (int)Scores[Pkg->ID] <<
                  " 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] ||
                   ((Cache[Start] & pkgDepCache::DepNow) == 0 &&
               if (Scores[I->ID] <= Scores[Pkg->ID] ||
                   ((Cache[Start] & pkgDepCache::DepNow) == 0 &&

-                   End->Type != pkgCache::Dep::Conflicts))
+                   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 (DoUpgrade(Pkg) == true)
               {
                  // Try a little harder to fix protected packages..
                  if ((Flags[I->ID] & Protected) == Protected)
                  {
                     if (DoUpgrade(Pkg) == true)

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

                     continue;
                  }
                  
                     continue;
                  }
                  


@@ -831,7 +939,10 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
                              clog << "  Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl;
                           Cache.MarkDelete(I);
                           if (Counter > 1)
                              clog << "  Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl;
                           Cache.MarkDelete(I);
                           if (Counter > 1)

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

                        }                       
                     }
                  }
                        }                       
                     }
                  }


@@ -842,21 +953,36 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
               }
               else
               {
               }
               else
               {

+                 /* 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;
                  // Skip adding to the kill list if it is protected
                  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 (Start->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 && Start->Type != pkgCache::Dep::Conflicts &&
+           if (VList[0] == 0 && 
+               Start->Type != pkgCache::Dep::Conflicts &&
+               Start->Type != pkgCache::Dep::Obsoletes &&

                (Flags[I->ID] & Protected) != Protected)
            {
               bool Installed = Cache[I].Install();
                (Flags[I->ID] & Protected) != Protected)
            {
               bool Installed = Cache[I].Install();


@@ -886,8 +1012,6 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
               Done = true;
            }
            
               Done = true;
            }
            

-           delete [] VList;
-           

            // Try some more
            if (InOr == true)
               continue;
            // Try some more
            if (InOr == true)
               continue;


@@ -904,7 +1028,8 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
               Change = true;
               if ((Cache[J->Dep] & pkgDepCache::DepGNow) == 0)
               {
               Change = true;
               if ((Cache[J->Dep] & pkgDepCache::DepGNow) == 0)
               {

-                 if (J->Dep->Type == pkgCache::Dep::Conflicts)
+                 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;
                  {
                     if (Debug == true)
                        clog << "  Fixing " << I.Name() << " via remove of " << J->Pkg.Name() << endl;


@@ -917,9 +1042,12 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
                     clog << "  Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl;
                  Cache.MarkKeep(J->Pkg);
               }
                     clog << "  Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl;
                  Cache.MarkKeep(J->Pkg);
               }

-              
+

               if (Counter > 1)
               if (Counter > 1)

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

            }      
         }
       }      
            }      
         }
       }      


@@ -927,10 +1055,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 
    if (Debug == true)
       clog << "Done" << endl;
 
    if (Debug == true)
       clog << "Done" << endl;

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

    if (Cache.BrokenCount() != 0)
    {
       // See if this is the result of a hold
    if (Cache.BrokenCount() != 0)
    {
       // See if this is the result of a hold


@@ -940,9 +1065,9 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
         if (Cache[I].InstBroken() == false)
            continue;
         if ((Flags[I->ID] & Protected) != Protected)
         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(_("Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages."));

       }
       }

-      return _error->Error("Unable to correct problems, you have held broken packages.");
+      return _error->Error(_("Unable to correct problems, you have held broken packages."));

    }
    
    return true;
    }
    
    return true;


@@ -955,7 +1080,7 @@ 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;
+   unsigned long Size = Cache.Head().PackageCount;

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


@@ -983,7 +1108,7 @@ 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)
       if ((Flags[I->ID] & Protected) == 0)
       {
         if (Debug == true)


@@ -991,7 +1116,7 @@ bool pkgProblemResolver::ResolveByKeep()
         Cache.MarkKeep(I);
         if (Cache[I].InstBroken() == false)
         {
         Cache.MarkKeep(I);
         if (Cache[I].InstBroken() == false)
         {

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

            continue;
         }
       }
            continue;
         }
       }


@@ -999,18 +1124,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;


@@ -1018,42 +1135,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);
+              }
+              
+              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;
       }


@@ -1065,7 +1187,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;


@@ -1088,3 +1210,34 @@ void pkgProblemResolver::InstallProtect()
    }   
 }
                                                                        /*}}}*/
    }   
 }
                                                                        /*}}}*/

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