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

[Daniel Burrows]

Author: dburrows
Date: Tue Jul 26 17:23:46 2005
New Revision: 3696

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc
Log:
Only match against one pattern in the custom pattern grouping.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jul 26 17:23:46 2005
@@ -2,6 +2,11 @@
 
 	* src/pkg_grouppolicy.cc:
 
+	  In the custom pattern-based grouping policy, stop checking
+	  patterns after the first match.
+
+	* src/pkg_grouppolicy.cc:
+
 	  In the custom pattern-based grouping policy, when creating a new
 	  subtree of the current tree, make sure to actually add the
 	  object that triggered the creation of the subtree to the new

Modified: branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc	Tue Jul 26 17:23:46 2005
@@ -1159,6 +1159,9 @@
 
 		  policy->add_package(pkg, tree);
 		}
+
+	      // Don't match any more.
+	      break;
 	    }
 	}
   }