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

[Daniel Burrows]

Author: dburrows
Date: Wed Aug 17 23:23:15 2005
New Revision: 3908

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_screen.cc
Log:
Track unresolved soft deps with an aptitude_universe::dep, not a pkgCache::DepIterator.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Aug 17 23:23:15 2005
@@ -1,5 +1,10 @@
 2005-08-17  Daniel Burrows  <dburrows at debian.org>
 
+	* src/solution_screen.cc:
+
+	  Use an aptitude_universe::dep, not a pkgCache::DepIterator, to
+	  track unresolved soft deps.
+
 	* src/vscreen/transcode.h:
 
 	  Remove format_arg specifiers, they don't work and break

Modified: branches/aptitude-0.3/aptitude/src/solution_screen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_screen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_screen.cc	Wed Aug 17 23:23:15 2005
@@ -538,10 +538,10 @@
 
 class solution_unresolved_item : public solution_item
 {
-  pkgCache::DepIterator d;
+  aptitude_universe::dep d;
 public:
   solution_unresolved_item(const aptitude_universe::dep &_d)
-    :d(_d.get_dep())
+    :d(_d)
   {
   }
 
@@ -610,8 +610,8 @@
       }
 
     wstring text = swsprintf(transcode(_("%s recommends %s")).c_str(),
-			     d.ParentPkg().Name(),
-			     dep_targets(d).c_str());
+			     d.get_dep().ParentPkg().Name(),
+			     dep_targets(d.get_dep()).c_str());
 
     wstring::const_iterator loc = text.begin();