X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=imapami%2Fconditions.py;h=4d06e88209e1aff40676a6cc6b3ac3a292a88af2;hb=638e4336394ed3de3c54f249377c4ed61dc1ac0e;hp=97675a7e045849da45c217b83a99a6305904888e;hpb=a5fad708a8f0fa43f183e5ec1044b0cd3da6d4ad;p=imapami.git

diff --git a/imapami/conditions.py b/imapami/conditions.py
index 97675a7..4d06e88 100644
--- a/imapami/conditions.py
+++ b/imapami/conditions.py
@@ -128,7 +128,8 @@ class ImapamiCondNot(ImapamiCond):
     name = "not"
     def __init__(self, cond):
         cond = new(cond)
-        ImapamiCond.__init__(self, fetch=cond.fetch, criteria=cond.criteria)
+        criteria = 'NOT (%s)' % (cond.get_criteria())
+        ImapamiCond.__init__(self, fetch=cond.fetch, criteria=criteria)
         self.cond = cond
 
     def check(self, ami, mail):
@@ -675,7 +676,7 @@ class ImapamiCondOr(ImapamiCond):
             else:
                 criteria = 'OR (%s) (%s)' % (criteria, crit)
         if criteria != '':
-            criteria = set().add(criteria)
+            criteria = set([criteria])
         fetch = imapami.utils.highest_fetch_level(
             [c.fetch for c in cond_list])
         ImapamiCond.__init__(self, fetch=fetch, criteria=criteria)