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

Daniel Burrows dburrows at costa.debian.org
Mon Aug 15 18:27:38 UTC 2005


Author: dburrows
Date: Mon Aug 15 18:27:36 2005
New Revision: 3839

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h
Log:
Fix the display of unresolved soft deps in solution dumps.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Aug 15 18:27:36 2005
@@ -1,5 +1,10 @@
 2005-08-15  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/problemresolver/solution.h:
+
+	  Fix how unresolved soft dependencies are displayed when dumping
+	  a solution.
+
 	* src/generic/aptitude_resolver_universe.h:
 
 	  Make all critical deps and all recommends interesting.

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h	Mon Aug 15 18:27:36 2005
@@ -462,7 +462,7 @@
 	  out << ", ";
 	out << i->first.get_name() << ":=" << i->second.ver.get_name();
       }
-    out << ">;[";
+    out << ">;";
 
 
     if(!get_unresolved_soft_deps().empty())
@@ -476,8 +476,12 @@
 	      out << ", ";
 	    out << *i;
 	  }
+
+	out << "!>;";
       }
 
+    out << "[";
+
     for(typename std::set<dep>::const_iterator i=get_broken().begin();
 	i!=get_broken().end(); ++i)
       {



More information about the Aptitude-svn-commit mailing list