X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/7e798dd739883c1f47216578ba8df34dced24777..fbfb2a7cad49c38a8a830ceadbc20ab89f683718:/apt-pkg/algorithms.cc

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 126318b59..350b57468 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.5 1998/10/08 04:54:58 jgg Exp $
+// $Id: algorithms.cc,v 1.8 1998/10/24 04:58:04 jgg Exp $
 /* ######################################################################
 
    Algorithms - A set of misc algorithms
@@ -245,14 +245,17 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
 	 Cache.MarkInstall(I,false);
 
    pkgProblemResolver Fix(Cache);
-   
+
    // Hold back held packages.
-   for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
+   if (_config->FindB("APT::Ingore-Hold",false) == false)
    {
-      if (I->SelectedState == pkgCache::State::Hold)
+      for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       {
-	 Fix.Protect(I);
-	 Cache.MarkKeep(I);
+	 if (I->SelectedState == pkgCache::State::Hold)
+	 {
+	    Fix.Protect(I);
+	    Cache.MarkKeep(I);
+	 }
       }
    }
    
@@ -277,8 +280,9 @@ bool pkgAllUpgrade(pkgDepCache &Cache)
       if (Cache[I].Install() == true)
 	 Fix.Protect(I);
 	  
-      if (I->SelectedState == pkgCache::State::Hold)
-	 continue;
+      if (_config->FindB("APT::Ingore-Hold",false) == false)
+	 if (I->SelectedState == pkgCache::State::Hold)
+	    continue;
       
       if (I->CurrentVer != 0 && Cache[I].InstallVer != 0)
 	 Cache.MarkInstall(I,false);
@@ -713,7 +717,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 		   ((Cache[End] & pkgDepCache::DepGNow) == 0 &&
 		    End->Type != pkgCache::Dep::Conflicts))
 	       {
-		  if ((Flags[I->ID] & Protected) != 0)
+		  if ((Flags[I->ID] & Protected) == Protected)
 		     continue;
 
 		  // See if a keep will do
@@ -755,7 +759,8 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 	    }
 
 	    // Hm, nothing can possibly satisify this dep. Nuke it.
-	    if (VList[0] == 0 && End->Type != pkgCache::Dep::Conflicts)
+	    if (VList[0] == 0 && End->Type != pkgCache::Dep::Conflicts &&
+		(Flags[I->ID] & Protected) != Protected)
 	    {
 	       Cache.MarkKeep(I);
 	       if (Cache[I].InstBroken() == false)
@@ -903,7 +908,6 @@ bool pkgProblemResolver::ResolveByKeep()
 	 
 	 // Look at all the possible provides on this package
 	 pkgCache::Version **VList = End.AllTargets();
-	 bool Done = false;
 	 for (pkgCache::Version **V = VList; *V != 0; V++)
 	 {
 	    pkgCache::VerIterator Ver(Cache,*V);
@@ -942,3 +946,20 @@ bool pkgProblemResolver::ResolveByKeep()
    return true;
 }
 									/*}}}*/
+// ProblemResolver::InstallProtect - Install all protected packages	/*{{{*/
+// ---------------------------------------------------------------------
+/* This is used to make sure protected packages are installed */
+void pkgProblemResolver::InstallProtect()
+{
+   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);
+      }
+   }   
+}
+									/*}}}*/