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

[Daniel Burrows]

Author: dburrows
Date: Tue Aug 16 02:07:31 2005
New Revision: 3862

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Add an assert.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug 16 02:07:31 2005
@@ -2,6 +2,10 @@
 
 	* src/generic/problemresolver/problemresolver.h:
 
+	  Add an assert to check that things remain sane.
+
+	* src/generic/problemresolver/problemresolver.h:
+
 	  Correct the calculation of the new score when choosing to leave
 	  a soft dependency unfixed.
 

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h	Tue Aug 16 02:07:31 2005
@@ -1236,6 +1236,7 @@
     version source_version=d.get_source();
     package source_package=source_version.get_package();
     version sol_version=s.version_of(source_package);
+    bool found = false;
 
 //     if(d.solvers_begin().end())
 //       {
@@ -1280,6 +1281,8 @@
 	      if(debug)
 		std::cout << "  Trying to resolve " << d << " by installing " << (*vi).get_package().get_name() << " version " << (*vi).get_name() << std::endl;
 
+	      found = true;
+
 	      action act(*vi, d, s.get_actions().size());
 	      if(try_install(s, &act, (&act)+1,
 			     (dep*)0, (dep*)0, d.solvers_begin()))
@@ -1313,6 +1316,8 @@
 	    if(debug)
 	      std::cout << "  Trying to resolve " << d << " by installing " << (*si).get_package().get_name() << " version " << (*si).get_name() << std::endl;
 
+	    found = true;
+
 	    action act(*si, d, s.get_actions().size());
 	    if(try_install(s, &act, (&act)+1,
 			   (dep*)0, (dep*)0,
@@ -1329,6 +1334,8 @@
 	  std::cout << "  Trying to ignore soft dependency " << d
 		    << std::endl;
 
+	found = true;
+
 	// Only score change is that something goes from being broken
 	// to being permanently unfixed and "soft".
 	if(try_enqueue(solution(s, d,
@@ -1336,6 +1343,10 @@
 				s.get_action_score())))
 	  ++count;
       }
+
+    // Otherwise we should have discarded this before calling
+    // generate_successors!
+    assert(found);
   }
 
   /** Generate "forced" successors -- those successors which are