File pykolab-0.6.11-apt-sieve-fixes-concat.patch of Package pykolab

File pykolab-0.6.11-apt-sieve-fixes-concat.patch of Package pykolab (Revision 63)

Currently displaying revision 63 , Show latest

diff -ur pykolab-0.6.11.orig/pykolab/cli/sieve/cmd_refresh.py pykolab-0.6.11/pykolab/cli/sieve/cmd_refresh.py
--- pykolab-0.6.11.orig/pykolab/cli/sieve/cmd_refresh.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11/pykolab/cli/sieve/cmd_refresh.py	2014-02-12 17:18:05.049219845 +0100
@@ -97,7 +97,7 @@
         active, scripts = result
 
     log.debug(_("Found the following scripts for user %s: %s") % (address, ','.join(scripts)), level=8)
-    log.deubg(_("And the following script is active for user %s: %s") % (address, active), level=8)
+    log.debug(_("And the following script is active for user %s: %s") % (address, active), level=8)
 
     mgmt_required_extensions = []
 
@@ -344,7 +344,9 @@
             mgmt_script.addfilter(rule_name, ['true'], forward_rules)
 
         else:
-            mgmt_script.addfilter(rule_name, [("X-Spam-Status", ":matches", "No,*")], forward_rules)
+            # NOTE: Messages with no X-Spam-Status header need to be matched
+            # too, and this does exactly that.
+            mgmt_script.addfilter(rule_name, [("not", ("X-Spam-Status", ":matches", "Yes,*"))], forward_rules)
 
     if sdf_filter:
         mgmt_script.addfilter('spam_delivery_folder', [("X-Spam-Status", ":matches", "Yes,*")], [("fileinto", "INBOX/Spam"), ("stop")])
diff -ur pykolab-0.6.11.orig/pykolab/plugins/sievemgmt/__init__.py pykolab-0.6.11/pykolab/plugins/sievemgmt/__init__.py
--- pykolab-0.6.11.orig/pykolab/plugins/sievemgmt/__init__.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11/pykolab/plugins/sievemgmt/__init__.py	2014-02-12 17:18:05.049219845 +0100
@@ -109,7 +109,7 @@
             active, scripts = result
 
         log.debug(_("Found the following scripts for user %s: %s") % (address, ','.join(scripts)), level=8)
-        log.deubg(_("And the following script is active for user %s: %s") % (address, active), level=8)
+        log.debug(_("And the following script is active for user %s: %s") % (address, active), level=8)
 
         mgmt_required_extensions = []
 
@@ -356,7 +356,9 @@
                 mgmt_script.addfilter(rule_name, ['true'], forward_rules)
 
             else:
-                mgmt_script.addfilter(rule_name, [("X-Spam-Status", ":matches", "No,*")], forward_rules)
+                # NOTE: Messages with no X-Spam-Status header need to be matched
+                # too, and this does exactly that.
+                mgmt_script.addfilter(rule_name, [("not", ("X-Spam-Status", ":matches", "Yes,*"))], forward_rules)
 
         if sdf_filter:
             mgmt_script.addfilter('spam_delivery_folder', [("X-Spam-Status", ":matches", "Yes,*")], [("fileinto", "INBOX/Spam"), ("stop")])