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

[Daniel Burrows]

Author: dburrows
Date: Sat Apr  9 14:45:33 2005
New Revision: 2961

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Fix the problemresolver dump output to comply with its input spec.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr  9 14:45:33 2005
@@ -1,5 +1,9 @@
 2005-04-09  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/problemresolver/problemresolver.h:
+
+	  Fix the dump output (again) to comply with the input spec.
+
 	* src/main.cc, src/cmdline/Makefile.am, src/cmdline/cmdline_dump_resolver.cc, src/cmdline/cmdline_dump_resolver.h:
 
 	  Add a debugging command to dump the resolver's state

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	Sat Apr  9 14:45:33 2005
@@ -790,11 +790,11 @@
 template<class PackageUniverse>
 void dump_universe(const PackageUniverse &world, std::ostream &out)
 {
-  out << "UNIVERSE ";
+  out << "UNIVERSE [";
   for(typename PackageUniverse::package_iterator p=world.packages_begin();
       !p.end(); ++p)
     {
-      out << "PACKAGE " << (*p).get_name() << " < ";
+      out << "  PACKAGE " << (*p).get_name() << " < ";
       for(typename PackageUniverse::package::version_iterator v=(*p).versions_begin();
 	  !v.end(); ++v)
 	out << (*v).get_name() << " ";
@@ -807,7 +807,7 @@
       const typename PackageUniverse::version &sv=(*d).get_source();
       const typename PackageUniverse::package &sp=sv.get_package();
 
-      out << "DEP " << sp.get_name() << " " << sv.get_name() << " < ";
+      out << "  DEP " << sp.get_name() << " " << sv.get_name() << " < ";
 
       for(typename PackageUniverse::dep::solver_iterator t=(*d).solvers_begin();
 	  !t.end(); ++t)
@@ -816,6 +816,7 @@
 	}
       out << " > " << endl;
     }
+  out << "]" << endl;
 }
 
 #endif