[Aptitude-svn-commit] r3899 - in branches/aptitude-0.3/aptitude: . src

Daniel Burrows dburrows at costa.debian.org
Wed Aug 17 21:49:13 UTC 2005


Author: dburrows
Date: Wed Aug 17 21:49:10 2005
New Revision: 3899

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_fragment.cc
Log:
Compilation fix.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Aug 17 21:49:10 2005
@@ -1,5 +1,15 @@
 2005-08-17  Daniel Burrows  <dburrows at debian.org>
 
+	* src/solution_fragment.cc:
+
+	  Silly compilation fix.
+
+	* src/solution_fragment.cc, src/solution_fragment.h, src/solution_screen.cc:
+
+	  Move archives() to solution_fragment and call it
+	  archives_text(); eliminate archives_fragment().  (probably this
+	  whole collection of routines should be pushed down to generic/)
+
 	* src/generic/problemresolver/problemresolver.h, src/generic/aptcache.cc, src/generic/aptcache.h, src/solution_screen.cc:
 
 	  Push the mandatory-version handling down into the generic

Modified: branches/aptitude-0.3/aptitude/src/solution_fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_fragment.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_fragment.cc	Wed Aug 17 21:49:10 2005
@@ -267,9 +267,9 @@
 	fragments.push_back(fragf("  %s [%s (%s) -> %s (%s)]%n",
 				  i->ParentPkg().Name(),
 				  i->ParentPkg().CurrentVer().VerStr(),
-				  archives_text(i->ParentPkg().CurrentVer()),
+				  archives_text(i->ParentPkg().CurrentVer()).c_str(),
 				  i->VerStr(),
-				  archives_text(*i)));
+				  archives_text(*i).c_str()));
 
       fragments.push_back(newline_fragment());
     }



More information about the Aptitude-svn-commit mailing list