Merge remote-tracking branch 'upstream/debian/sid'

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

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index c2c38e7287efca121603a7d70e04ae617bd3af2f..85799a11b9cbc17f955c22df05d929f03c716dce 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -846,7 +846,8 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
    while (Again == true);
 
    if (Debug == true) {
-      clog << "Starting, broken count: " << Cache.BrokenCount() << endl;
+      clog << "Starting pkgProblemResolver with broken count: " 
+           << Cache.BrokenCount() << endl;
    }
    
    MakeScores();
@@ -876,7 +877,8 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
    }
 
    if (Debug == true) {
-      clog << "Starting 2, broken count: " << Cache.BrokenCount() << endl;
+      clog << "Starting 2 pkgProblemResolver with broken count: " 
+           << Cache.BrokenCount() << endl;
    }
 
    /* Now consider all broken packages. For each broken package we either
@@ -1442,9 +1444,11 @@ bool pkgProblemResolver::ResolveByKeepInternal()
    return true;
 }
                                                                        /*}}}*/
-// ProblemResolver::InstallProtect - Install all protected packages    /*{{{*/
+// ProblemResolver::InstallProtect - deprecated cpu-eating no-op       /*{{{*/
 // ---------------------------------------------------------------------
-/* This is used to make sure protected packages are installed */
+/* Actions issued with FromUser bit set are protected from further
+   modification (expect by other calls with FromUser set) nowadays , so we
+   don't need to reissue actions here, they are already set in stone. */
 void pkgProblemResolver::InstallProtect()
 {
    pkgDepCache::ActionGroup group(Cache);