[Debtags-commits] [svn] r1373 - in debtags-edit/trunk: . debian src

[Enrico Zini]

Author: enrico
Date: Sun Sep 25 13:10:29 2005
New Revision: 1373

Modified:
   debtags-edit/trunk/Makefile.am
   debtags-edit/trunk/debian/changelog
   debtags-edit/trunk/src/FilterPanel.cc
Log:
Tag matcher now only takes one tag


Modified: debtags-edit/trunk/Makefile.am
==============================================================================
--- debtags-edit/trunk/Makefile.am	(original)
+++ debtags-edit/trunk/Makefile.am	Sun Sep 25 13:10:29 2005
@@ -4,4 +4,4 @@
 
 man_MANS = debtags-edit.1
 
-EXTRA_DIST = DONE $(man_MANS) facetdialog.rst
+EXTRA_DIST = $(man_MANS) facetdialog.rst

Modified: debtags-edit/trunk/debian/changelog
==============================================================================
--- debtags-edit/trunk/debian/changelog	(original)
+++ debtags-edit/trunk/debian/changelog	Sun Sep 25 13:10:29 2005
@@ -1,10 +1,10 @@
 debtags-edit (1.1.2) unstable; urgency=low
 
-  * Ported to new libapt-front
+  * Ported to new libapt-front.  Closes: #325711.
   * We don't depend on libdebtags1 anymore, as it has been merged in
     libapt-front
 
- -- Enrico Zini <enrico at debian.org>  Sun, 25 Sep 2005 15:00:20 +0200
+ -- Enrico Zini <enrico at debian.org>  Sun, 25 Sep 2005 15:05:07 +0200
 
 debtags-edit (1.1.1) experimental; urgency=low
 

Modified: debtags-edit/trunk/src/FilterPanel.cc
==============================================================================
--- debtags-edit/trunk/src/FilterPanel.cc	(original)
+++ debtags-edit/trunk/src/FilterPanel.cc	Sun Sep 25 13:10:29 2005
@@ -668,8 +668,9 @@
 		p = p and predicate::Factory<Package>::description(desc_f);
 	if (!maint_f.empty())
 		p = p and predicate::Factory<Package>::maintainer(maint_f);
-	if (!tags_f.empty())
-		p = p and predicate::Factory<Package>::tag(tags_f);
+	for (typename OpSet<Tag>::const_iterator i = tags_f.begin();
+			i != tags_f.end(); i++)
+		p = p and predicate::Factory<Package>::tag(*i);
 	switch (statusFilter.get_history())
 	{
 		case 1: