r318 - in branches/rewrite: . src

[Otavio Salvador]

Author: otavio
Date: Tue Nov 16 07:46:05 2004
New Revision: 318

Modified:
   branches/rewrite/   (props changed)
   branches/rewrite/src/PackageList.py
Log:
 r273@nurf:  otavio | 2004-11-16T14:45:22.783583Z
 Fix filter since it should compare strings and handle duplicated packages.


Modified: branches/rewrite/src/PackageList.py
==============================================================================
--- branches/rewrite/src/PackageList.py	(original)
+++ branches/rewrite/src/PackageList.py	Tue Nov 16 07:46:05 2004
@@ -110,20 +110,27 @@
         packages = PackageList()
         
         for (item, value) in condition.items():
-            if item is "subsection":
+            if item == "subsection":
                 d = self._subsection
-            elif item is "priority":
+            elif item == "priority":
                 d = self._priority
             else:
                 d = self._name
 
             regexp = re.compile(value)
             for k in d.keys():
-                if regexp.match(k):
+                if k and regexp.match(k):
+                    # Add all match packages
                     if isinstance(d[k], list):
                         for i in d[k]:
-                            packages.add(i)
+                            try:
+                                packages.add(i)
+                            except PackageAlreadyExists, e:
+                                pass # We possible will repeat packages
                     else:
-                        packages.add(d[k])
+                        try:
+                            packages.add(d[k])
+                        except PackageAlreadyExists, e:
+                            pass # We possible will repeat packages
 
         return packages