X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/04aa15a8300dd48b950a7a28178abeb96589fdb0..58d63ae695eb9f979e65fa8c01fa2c34d61e6527:/apt-pkg/algorithms.cc?ds=sidebyside

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 43593e71b..9ca6ca590 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: algorithms.cc,v 1.15 1999/01/30 02:12:53 jgg Exp $
+// $Id: algorithms.cc,v 1.21 1999/07/09 04:11:33 jgg Exp $
 /* ######################################################################
 
    Algorithms - A set of misc algorithms
@@ -33,6 +33,11 @@ pkgSimulate::pkgSimulate(pkgDepCache &Cache) : pkgPackageManager(Cache),
 {
    Flags = new unsigned char[Cache.HeaderP->PackageCount];
    memset(Flags,0,sizeof(*Flags)*Cache.HeaderP->PackageCount);
+
+   // Fake a filename so as not to activate the media swapping
+   string Jnk = "SIMULATE";
+   for (int I = 0; I != Cache.Head().PackageCount; I++)
+      FileNames[I] = Jnk;
 }
 									/*}}}*/
 // Simulate::Install - Simulate unpacking of a package			/*{{{*/
@@ -120,14 +125,17 @@ bool pkgSimulate::Configure(PkgIterator iPkg)
 // 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);
-   cout << "Remv " << Pkg.Name();
+   if (Purge == true)
+      cout << "Purg " << Pkg.Name();
+   else
+      cout << "Remv " << Pkg.Name();
 
    if (Sim.BrokenCount() != 0)
       ShortBreaks();
@@ -169,16 +177,37 @@ bool pkgApplyStatus(pkgDepCache &Cache)
       if (I->InstState == pkgCache::State::ReInstReq ||
 	  I->InstState == pkgCache::State::HoldReInstReq)
       {
-	 Cache.MarkKeep(I);
+	 if (I.CurrentVer().Downloadable() == true)
+	    Cache.MarkKeep(I);
+	 else
+	 {
+	    // Is this right? Will dpkg choke on an upgrade?
+	    if (Cache[I].CandidateVerIter(Cache).Downloadable() == true)
+	       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());
+	 }
+	 
 	 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:
-	 Cache.MarkKeep(I);
+	 if (I.CurrentVer().Downloadable() == true || 
+	     I.State() != pkgCache::PkgIterator::NeedsUnpack)
+	    Cache.MarkKeep(I);
+	 else
+	 {
+	    if (Cache[I].CandidateVerIter(Cache).Downloadable() == true)
+	       Cache.MarkInstall(I);
+	    else
+	       Cache.MarkDelete(I);
+	 }
 	 break;
 
 	 // This means removal failed
@@ -700,7 +729,8 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 	    {
 	       if (Debug == true)
 		  clog << "Note, a broken or group was found in " << I.Name() << "." << endl;
-	       Cache.MarkDelete(I);
+	       if ((Flags[I->ID] & Protected) != Protected)
+		  Cache.MarkDelete(I);
 	       break;
 	    }
 	    	    
@@ -733,10 +763,16 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 		   ((Cache[End] & pkgDepCache::DepGNow) == 0 &&
 		    End->Type != pkgCache::Dep::Conflicts))
 	       {
+		  // Try a little harder to fix protected packages..
 		  if ((Flags[I->ID] & Protected) == Protected)
+		  {
+		     if (DoUpgrade(Pkg) == true)
+			Scores[Pkg->ID] = Scores[I->ID];
 		     continue;
-
-		  // See if a keep will do
+		  }
+		  
+		  /* See if a keep will do, unless the package is protected,
+		     then installing it will be necessary */	
 		  Cache.MarkKeep(I);
 		  if (Cache[I].InstBroken() == false)
 		  {
@@ -754,7 +790,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 			   Scores[I->ID] = Scores[Pkg->ID];
 		     }
 		  }
-
+		  		  
 		  Change = true;
 		  Done = true;
 		  break;
@@ -834,8 +870,19 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
    delete [] PList;
    
    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.");
+   }
+   
    return true;
 }
 									/*}}}*/