[Aptitude-svn-commit] r3956 - in branches/aptitude-0.3/aptitude: . tests

[Daniel Burrows]

Author: dburrows
Date: Thu Aug 25 22:21:31 2005
New Revision: 3956

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
Log:
Take sources into account in the new branch.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 25 22:21:31 2005
@@ -2,6 +2,11 @@
 
 	* tests/test_apt_universe.cc:
 
+	  Right, take sources into account in the other branch (this code
+	  should probably be reorganized to be less brittle!).
+
+	* tests/test_apt_universe.cc:
+
 	  Instead of completely ceasing tests after a certain amount of
 	  time, just test the rest of the archive less aggressively.
 

Modified: branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc	Thu Aug 25 22:21:31 2005
@@ -172,6 +172,7 @@
 		!vi.end(); ++vi)
 	      {
 		if(solvers.find(*vi) == solvers.end() &&
+		   (*vi == (*di).get_source() || (*vi).get_package() != (*di).get_source().get_package()) &&
 		   (*di).solved_by(*vi))
 		  {
 		    std::ostringstream out;