[Aptitude-devel] r2973 - in branches/aptitude-0.3/aptitude: . src/generic/problemresolver

[Daniel Burrows]

Author: dburrows
Date: Sat Apr  9 19:42:07 2005
New Revision: 2973

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h
Log:
Always hide noncritical deps in a dump.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr  9 19:42:07 2005
@@ -1,5 +1,9 @@
 2005-04-09  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/problemresolver/aptitude_resolver.h:
+
+	  Make sure to never ever ever produce noncritical deps in a dump.
+
 	* src/cmdline/cmdline_dump_resolver.cc:
 
 	  Always return success after a dump.

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h	Sat Apr  9 19:42:07 2005
@@ -691,6 +691,14 @@
 
       assert(!prv_open);
 
+      // Skip any dependencies that shouldn't show up in the output.
+      // Need to do this here as well as below in case dep already
+      // points to such a dependency.
+      while(!dep.end() &&
+	    (dep.ParentPkg() == dep.TargetPkg() ||
+	     !dep.IsCritical()))
+	++dep;
+
       // Now, if we ran our of deps, try to find another one.
       while(dep.end() && !pkg.end())
 	{