kdenonbeta/kdedebian/kapture/libcapture

[Peter Rockai <mornfall@logisys.dyndns.org>]

CVS commit by mornfall: 

Few debugging aides...
WARNING: The code, as it is in CVS, tried to uninstall most of my
packages. So if you are going to test it, please watch terminal output
for fuckups and ctrl+c as appropriate. It happened to me once, but
i can't reproduce it. Other than that, package installation seems to
work. Woohoo! =)


  M +7 -1      pkgcache.cpp   1.13
  M +9 -0      pkgmanager.cpp   1.11


--- kdenonbeta/kdedebian/kapture/libcapture/pkgcache.cpp  #1.12:1.13
@@ -629,9 +629,15 @@ void PkgCache::applyAWanted (void)
     }
     for (PkgIterator mP = PkgBegin (); ! mP . end (); mP ++) {
-        if (operator [] (mP) . NowBroken ())
+        if (operator [] (mP) . NowBroken ()) {
             cerr << "BROKEN " << mP . Name ()
                 << ": a_wanted_pri = " << s -> a_wanted_pri
                 << ", a_unwanted_pri = " << s -> a_unwanted_pri << endl;
     }
+        if (operator [] (mP) . Delete ()) {
+            cerr << "DELETE " << mP . Name ()
+                << ": a_wanted_pri = " << s -> a_wanted_pri
+                << ", a_unwanted_pri = " << s -> a_unwanted_pri << endl;
+        }
+    }
 }
                                                                     /* }}} */

--- kdenonbeta/kdedebian/kapture/libcapture/pkgmanager.cpp  #1.10:1.11
@@ -446,4 +446,13 @@ bool PkgManager::_commit (CommitStatus *
         _system->UnLock();
 
+    int count = 0;
+    for (pkgCache::PkgIterator mP = m_cache -> PkgBegin (); ! mP . end (); mP ++) {
+        if (m_cache [mP] . Delete ()) {
+            cerr << "M: DELETE " << mP . Name () << endl;
+            count ++;
+        }
+    }
+    if (count != m_cache -> DelCount ())
+        abort ();
     // Run it
     while (1)