X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3eeeb009e1c8198d91f0925694e84304cf3d84a6..b826eb9e018b9abccea67bfa08c075a342ebe59b:/apt-pkg/algorithms.cc

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 967aba180..505ba59f7 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.16 1999/02/05 02:26:00 jgg Exp $
+// $Id: algorithms.cc,v 1.18 1999/06/04 02:31:37 jgg Exp $
 /* ######################################################################
 
    Algorithms - A set of misc algorithms
@@ -169,16 +169,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
@@ -755,7 +776,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 			   Scores[I->ID] = Scores[Pkg->ID];
 		     }
 		  }
-
+		  		  
 		  Change = true;
 		  Done = true;
 		  break;
@@ -835,8 +856,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;
 }
 									/*}}}*/