[Aptitude-svn-commit] r3645 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Mon Jul 11 16:36:00 2005
New Revision: 3645

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Pull out some old debugging code (oops).

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jul 11 16:36:00 2005
@@ -1,5 +1,9 @@
 2005-07-11  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
+
+	  Remove some no-longer-necessary debug code.
+
 	* src/generic/aptitude_resolver.h:
 
 	  When leaving a Provides list while iterating over broken deps,

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc	Mon Jul 11 16:36:00 2005
@@ -29,14 +29,6 @@
 {
 }
 
-void aptitude_universe::broken_dep_iterator::check_for_libjack()
-{
-  bool is_libjack_0800=!pkg.end() && pkg.Name() && !strcmp(pkg.Name(), "libjack0.80.0-0");
-  if(is_libjack_0800)
-    std::cout << "Found libjack0.80.0-0." << std::endl;
-}
-
-
 void aptitude_resolver::add_action_scores(int preserve_score, int auto_score,
 					  int remove_score, int keep_score,
 					  int install_score, int upgrade_score,

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	Mon Jul 11 16:36:00 2005
@@ -1172,13 +1172,9 @@
       return ((*cache)[d2] & pkgDepCache::DepGInstall)==0;
     }
 
-    void check_for_libjack();
-
     // Push forward to the next interesting point.
     void normalize()
     {
-      check_for_libjack();
-
       while(!the_dep.end() &&
 	    !(the_dep.IsCritical() &&
 	      dep_is_inst_broken(the_dep)))
@@ -1190,12 +1186,8 @@
 	  // Otherwise we just spin on the same package over and over,
 	  // since it's still broken..
 	  ++pkg;
-	  check_for_libjack();
 	  while(!pkg.end() && !(*cache)[pkg].InstBroken())
-	    {
-	      ++pkg;
-	      check_for_libjack();
-	    }
+	    ++pkg;
 
 	  if(!pkg.end())
 	    {