From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 20 Dec 2006 10:01:03 +0000 (+0100)
Subject: * merged from main
X-Git-Tag: 0.7.24ubuntu1~206
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a345a69945548525d5219fcd18e3754f4d252bfd?hp=-c

* merged from main
---

a345a69945548525d5219fcd18e3754f4d252bfd
diff --combined apt-pkg/algorithms.cc
index eb59a42ca,5fa16e66f..bd8147291
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@@ -20,12 -20,10 +20,12 @@@
  #include <apt-pkg/algorithms.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/configuration.h>
 +#include <apt-pkg/version.h>
  #include <apt-pkg/sptr.h>
 +
      
  #include <apti18n.h>
 -    
 +#include <sys/types.h>
  #include <iostream>
  									/*}}}*/
  using namespace std;
@@@ -102,7 -100,6 +102,7 @@@ bool pkgSimulate::Install(PkgIterator i
  	 DepIterator End;
  	 D.GlobOr(Start,End);
  	 if (Start->Type == pkgCache::Dep::Conflicts ||
 +	     Start->Type == pkgCache::Dep::DpkgBreaks ||
  	     Start->Type == pkgCache::Dep::Obsoletes ||
  	     End->Type == pkgCache::Dep::PreDepends)
           {
@@@ -152,8 -149,6 +152,8 @@@ bool pkgSimulate::Configure(PkgIterato
  	    cout << " Obsoletes:" << D.TargetPkg().Name();
  	 else if (D->Type == pkgCache::Dep::Conflicts)
  	    cout << " Conflicts:" << D.TargetPkg().Name();
 +	 else if (D->Type == pkgCache::Dep::DpkgBreaks)
 +	    cout << " Breaks:" << D.TargetPkg().Name();
  	 else
  	    cout << " Depends:" << D.TargetPkg().Name();
        }	    
@@@ -225,8 -220,6 +225,8 @@@ void pkgSimulate::ShortBreaks(
     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++)
     {
        if (I->VersionList == 0)
@@@ -237,13 -230,13 +237,13 @@@
  	  I->InstState == pkgCache::State::HoldReInstReq)
        {
  	 if (I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true)
 -	    Cache.MarkKeep(I);
 +	    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);
 +	       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());
@@@ -260,12 -253,12 +260,12 @@@
  	 case pkgCache::State::HalfConfigured:
  	 if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) ||
  	     I.State() != pkgCache::PkgIterator::NeedsUnpack)
 -	    Cache.MarkKeep(I);
 +	    Cache.MarkKeep(I, false, false);
  	 else
  	 {
  	    if (Cache[I].CandidateVer != 0 &&
  		 Cache[I].CandidateVerIter(Cache).Downloadable() == true)
 -	       Cache.MarkInstall(I);
 +	       Cache.MarkInstall(I, true, 0, false);
  	    else
  	       Cache.MarkDelete(I);
  	 }
@@@ -291,12 -284,10 +291,12 @@@
     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)
 -	 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 */
@@@ -309,7 -300,7 +309,7 @@@
        if (Cache[I].InstVerIter(Cache).Downloadable() == false)
  	 continue;
  
 -      Cache.MarkInstall(I,true);      
 +      Cache.MarkInstall(I, true, 0, false);
     }
     
     pkgProblemResolver Fix(&Cache);
@@@ -326,25 -317,23 +326,25 @@@
   */
  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)
 -	 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)
 -	 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)
 -	 Cache.MarkInstall(I,false);
 +	 Cache.MarkInstall(I, false, 0, false);
  
     pkgProblemResolver Fix(&Cache);
  
@@@ -356,7 -345,7 +356,7 @@@
  	 if (I->SelectedState == pkgCache::State::Hold)
  	 {
  	    Fix.Protect(I);
 -	    Cache.MarkKeep(I);
 +	    Cache.MarkKeep(I, false, false);
  	 }
        }
     }
@@@ -371,8 -360,6 +371,8 @@@
     to install packages not marked for install */
  bool pkgAllUpgrade(pkgDepCache &Cache)
  {
 +   pkgDepCache::ActionGroup group(Cache);
 +
     pkgProblemResolver Fix(&Cache);
  
     if (Cache.BrokenCount() != 0)
@@@ -389,7 -376,7 +389,7 @@@
  	    continue;
        
        if (I->CurrentVer != 0 && Cache[I].InstallVer != 0)
 -	 Cache.MarkInstall(I,false);
 +	 Cache.MarkInstall(I, false, 0, false);
     }
        
     return Fix.ResolveByKeep();
@@@ -402,8 -389,6 +402,8 @@@
     the package is restored. */
  bool pkgMinimizeUpgrade(pkgDepCache &Cache)
  {   
 +   pkgDepCache::ActionGroup group(Cache);
 +
     if (Cache.BrokenCount() != 0)
        return false;
     
@@@ -420,9 -405,9 +420,9 @@@
  	    continue;
  
  	 // Keep it and see if that is OK
 -	 Cache.MarkKeep(I);
 +	 Cache.MarkKeep(I, false, false);
  	 if (Cache.BrokenCount() != 0)
 -	    Cache.MarkInstall(I,false);
 +	    Cache.MarkInstall(I, false, 0, false);
  	 else
  	 {
  	    // If keep didnt actually do anything then there was no change..
@@@ -512,7 -497,7 +512,7 @@@ void pkgProblemResolver::MakeScores(
           on the same level. We enhance the score of installed packages 
  	 if those are not obsolete
        */
-       if (I->CurrentVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable())
+       if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable())
  	 Score += 1;
     }
  
@@@ -582,8 -567,6 +582,8 @@@
     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] & Protected) == Protected)
@@@ -592,7 -575,7 +592,7 @@@
     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)
@@@ -656,7 -639,6 +656,7 @@@
  	       /* 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::DpkgBreaks || 
  		   Start->Type == pkgCache::Dep::Obsoletes)
  		   break;
  	       
@@@ -678,7 -660,7 +678,7 @@@
     if (Fail == true)
     {
        if (WasKept == true)
 -	 Cache.MarkKeep(Pkg);
 +	 Cache.MarkKeep(Pkg, false, false);
        else
  	 Cache.MarkDelete(Pkg);
        return false;
@@@ -705,8 -687,6 +705,8 @@@
     upgrade packages to advoid problems. */
  bool pkgProblemResolver::Resolve(bool BrokenFix)
  {
 +   pkgDepCache::ActionGroup group(Cache);
 +
     unsigned long Size = Cache.Head().PackageCount;
  
     // Record which packages are marked for install
@@@ -722,7 -702,7 +722,7 @@@
  	 {
  	    if (Cache[I].InstBroken() == true && BrokenFix == true)
  	    {
 -	       Cache.MarkInstall(I,false);
 +	       Cache.MarkInstall(I, false, 0, false);
  	       if (Cache[I].Install() == true)
  		  Again = true;
  	    }
@@@ -788,14 -768,14 +788,14 @@@
  	    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
 -		  Cache.MarkKeep(I);
 +		  Cache.MarkKeep(I, false, false);
  	    }	    
  	    else
  	       if (Debug == true)
@@@ -840,7 -820,7 +840,7 @@@
  		  {
  		     if (Debug == true)
  			clog << "  Or group keep for " << I.Name() << endl;
 -		     Cache.MarkKeep(I);
 +		     Cache.MarkKeep(I, false, false);
  		     Change = true;
  		  }
  	       }
@@@ -884,7 -864,6 +884,7 @@@
  	    SPtrArray<pkgCache::Version *> VList = Start.AllTargets();
  	    if (*VList == 0 && (Flags[I->ID] & Protected) != Protected &&
  		Start->Type != pkgCache::Dep::Conflicts &&
 +		Start->Type != pkgCache::Dep::DpkgBreaks &&
  		Start->Type != pkgCache::Dep::Obsoletes &&
  		Cache[I].NowBroken() == false)
  	    {	       
@@@ -896,7 -875,7 +896,7 @@@
  	       }
  	       
  	       Change = true;
 -	       Cache.MarkKeep(I);		  
 +	       Cache.MarkKeep(I, false, false);
  	       break;
  	    }
  	    
@@@ -915,7 -894,6 +915,7 @@@
  	       if (Scores[I->ID] <= Scores[Pkg->ID] ||
  		   ((Cache[Start] & pkgDepCache::DepNow) == 0 &&
  		    End->Type != pkgCache::Dep::Conflicts &&
 +		    End->Type != pkgCache::Dep::DpkgBreaks &&
  		    End->Type != pkgCache::Dep::Obsoletes))
  	       {
  		  // Try a little harder to fix protected packages..
@@@ -934,7 -912,7 +934,7 @@@
  		  /* 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);
 +		  Cache.MarkKeep(I, false, false);
  		  if (Cache[I].InstBroken() == false)
  		  {
  		     // Unwind operation will be keep now
@@@ -943,7 -921,7 +943,7 @@@
  		     
  		     // Restore
  		     if (InOr == true && Installed == true)
 -			Cache.MarkInstall(I,false);
 +			Cache.MarkInstall(I, false, 0, false);
  		     
  		     if (Debug == true)
  			clog << "  Holding Back " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl;
@@@ -981,22 -959,7 +981,22 @@@
  		      (Start->Type == pkgCache::Dep::Conflicts ||
  		       Start->Type == pkgCache::Dep::Obsoletes))
  		     continue;
 -		  
 +
 +		  if (Start->Type == pkgCache::Dep::DpkgBreaks)
 +		  {
 +		     /* Would it help if we upgraded? */
 +		     if (Cache[End] & pkgDepCache::DepGCVer) {
 +			if (Debug)
 +			   clog << "  Upgrading " << Pkg.Name() << " due to Breaks field in " << I.Name() << endl;
 +			Cache.MarkInstall(Pkg, false, 0, false);
 +			continue;
 +		     }
 +		     if (Debug)
 +			clog << "  Will not break " << Pkg.Name() << " as stated in Breaks field in " << I.Name() <<endl;
 +		     Cache.MarkKeep(I, false, false);
 +		     continue;
 +		  }
 +
  		  // Skip adding to the kill list if it is protected
  		  if ((Flags[Pkg->ID] & Protected) != 0)
  		     continue;
@@@ -1017,7 -980,6 +1017,7 @@@
  	    // Hm, nothing can possibly satisify this dep. Nuke it.
  	    if (VList[0] == 0 && 
  		Start->Type != pkgCache::Dep::Conflicts &&
 +		Start->Type != pkgCache::Dep::DpkgBreaks &&
  		Start->Type != pkgCache::Dep::Obsoletes &&
  		(Flags[I->ID] & Protected) != Protected)
  	    {
@@@ -1031,7 -993,7 +1031,7 @@@
  		  
  		  // Restore
  		  if (InOr == true && Installed == true)
 -		     Cache.MarkInstall(I,false);
 +		     Cache.MarkInstall(I, false, 0, false);
  		  
  		  if (Debug == true)
  		     clog << "  Holding Back " << I.Name() << " because I can't find " << Start.TargetPkg().Name() << endl;
@@@ -1076,7 -1038,7 +1076,7 @@@
  	       {
  		  if (Debug == true)
  		     clog << "  Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl;
 -		  Cache.MarkKeep(J->Pkg);
 +		  Cache.MarkKeep(J->Pkg, false, false);
  	       }
  
  	       if (Counter > 1)
@@@ -1106,20 -1068,6 +1106,20 @@@
        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;
  }
  									/*}}}*/
@@@ -1130,8 -1078,6 +1130,8 @@@
     system was non-broken previously. */
  bool pkgProblemResolver::ResolveByKeep()
  {
 +   pkgDepCache::ActionGroup group(Cache);
 +
     unsigned long Size = Cache.Head().PackageCount;
  
     if (Debug == true)      
@@@ -1165,7 -1111,7 +1165,7 @@@
        {
  	 if (Debug == true)
  	    clog << "Keeping package " << I.Name() << endl;
 -	 Cache.MarkKeep(I);
 +	 Cache.MarkKeep(I, false, false);
  	 if (Cache[I].InstBroken() == false)
  	 {
  	    K = PList - 1;
@@@ -1213,7 -1159,7 +1213,7 @@@
  	       {
  		  if (Debug == true)
  		     clog << "  Keeping Package " << Pkg.Name() << " due to dep" << endl;
 -		  Cache.MarkKeep(Pkg);
 +		  Cache.MarkKeep(Pkg, false, false);
  	       }
  	       
  	       if (Cache[I].InstBroken() == false)
@@@ -1250,21 -1196,14 +1250,21 @@@
  /* 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)
        {
  	 if ((Flags[I->ID] & ToRemove) == ToRemove)
  	    Cache.MarkDelete(I);
 -	 else
 -	    Cache.MarkInstall(I,false);
 +	 else 
 +	 {
 +	    // preserver the information if the package was auto
 +	    // or manual installed
 +	    bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto);
 +	    Cache.MarkInstall(I, false, 0, !autoInst);
 +	 }
        }
     }   
  }
@@@ -1300,4 -1239,3 +1300,4 @@@ void pkgPrioSortList(pkgCache &Cache,pk
     qsort(List,Count,sizeof(*List),PrioComp);
  }
  									/*}}}*/
 +