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

[Daniel Burrows]

Author: dburrows
Date: Sat Aug  6 17:57:43 2005
New Revision: 3719

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/matchers.cc
Log:
Detect ANY package that no action is being performed on in the keep matcher.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Aug  6 17:57:43 2005
@@ -2,6 +2,11 @@
 
 	* src/generic/matchers.cc:
 
+	  Change the 'keep' matcher to detect ANY package that no action
+	  is being performed on, including not-installed packages.
+
+	* src/generic/matchers.cc:
+
 	  Fix the behavior of NOT when match results are being stored.
 
 	* src/generic/aptcache.cc:

Modified: branches/aptitude-0.3/aptitude/src/generic/matchers.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/matchers.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/matchers.cc	Sat Aug  6 17:57:43 2005
@@ -824,13 +824,13 @@
   bool matches(const pkgCache::PkgIterator &pkg,
 	       const pkgCache::VerIterator &ver)
   {
-    return !pkg.CurrentVer().end() && (*apt_cache_file)[pkg].Keep();
+    return (*apt_cache_file)[pkg].Keep();
   }
 
   pkg_match_result *get_match(const pkgCache::PkgIterator &pkg,
 			      const pkgCache::VerIterator &ver)
   {
-    if(!pkg.CurrentVer().end() && (*apt_cache_file)[pkg].Keep())
+    if((*apt_cache_file)[pkg].Keep())
       return new unitary_result(_("Keep"));
     else
       return NULL;