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

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 01:37:14 2005
New Revision: 2990

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Add spacing between the components of a depends list.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 01:37:14 2005
@@ -1,5 +1,9 @@
 2005-04-09  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
+
+	  Add spacing between the components of a depends list.
+
 	* src/generic/aptitude_resolver.h:
 
 	  Don't spin forever looking for broken deps.

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc	Sun Apr 10 01:37:14 2005
@@ -90,8 +90,12 @@
       << " -> {";
 
   for(aptitude_resolver_dep::solver_iterator i=d.solvers_begin(); !i.end(); ++i)
-    out << (*i).get_package().get_name() << " "
-	<< (*i).get_name();
+    {
+      if(i!=d.solvers_begin())
+	out << " ";
+      out << (*i).get_package().get_name() << " "
+	  << (*i).get_name();
+    }
   out << "}";
 
   return out;

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	Sun Apr 10 01:37:14 2005
@@ -588,6 +588,22 @@
   {
   }
 
+  bool operator==(const solver_iterator &other) const
+  {
+    return dep_lst == other.dep_lst &&
+      ver_lst == other.ver_lst &&
+      prv_lst == other.prv_lst &&
+      finished == other.finished;
+  }
+
+  bool operator!=(const solver_iterator &other) const
+  {
+    return dep_lst != other.dep_lst ||
+      ver_lst != other.ver_lst ||
+      prv_lst != other.prv_lst ||
+      finished != other.finished;
+  }
+
   solver_iterator &operator++()
   {
     assert(!end());