Stricter regexp

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py
index c4c0e49..aac5a23 100755 (executable)
--- a/bin/lists.rpc.py
+++ b/bin/lists.rpc.py
@@ -708,14 +708,14 @@ def set_bogo_level(userdesc, perms, vhost, listname, level):
             return 0
         hfr = []
         if int(level) is 1:
-            hfr.append(('X-Spam-Flag: Unsure', mm_cfg.HOLD, False))
+            hfr.append(('X-Spam-Flag: Unsure, tests=bogofilter', mm_cfg.HOLD, False))
             hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.HOLD, False))
         elif int(level) is 2:
-            hfr.append(('X-Spam-Flag: Unsure', mm_cfg.HOLD, False))
+            hfr.append(('X-Spam-Flag: Unsure, tests=bogofilter', mm_cfg.HOLD, False))
             hfr.append(('X-Spam-Flag: Yes, tests=bogofilter, spamicity=(0\.999999|1\.000000)', mm_cfg.DISCARD, False))
             hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.HOLD, False))
         elif int(level) is 3:
-            hfr.append(('X-Spam-Flag: Unsure', mm_cfg.HOLD, False))
+            hfr.append(('X-Spam-Flag: Unsure, tests=bogofilter', mm_cfg.HOLD, False))
             hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.DISCARD, False))
         if mlist.header_filter_rules != hfr:
             mlist.Lock()

diff --git a/upgrade/0.9.16/upgrade_lists.py b/upgrade/0.9.16/upgrade_lists.py
index e62561c..d521f8b 100755 (executable)
--- a/upgrade/0.9.16/upgrade_lists.py
+++ b/upgrade/0.9.16/upgrade_lists.py
@@ -30,14 +30,14 @@ def set_bogo_level(mlist, level):
     return
   hfr = []
   if level == 1:
-    hfr.append(('X-Spam-Flag: Unsure', mm_cfg.HOLD, False))
+    hfr.append(('X-Spam-Flag: Unsure, tests=bogofilter', mm_cfg.HOLD, False))
     hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.HOLD, False))
   elif level == 2:
-    hfr.append(('X-Spam-Flag: Unsure', mm_cfg.HOLD, False))
+    hfr.append(('X-Spam-Flag: Unsure, tests=bogofilter', mm_cfg.HOLD, False))
     hfr.append(('X-Spam-Flag: Yes, tests=bogofilter, spamicity=(0\.999999|1\.000000)', mm_cfg.DISCARD, False))
     hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.HOLD, False))
   elif level == 3:
-    hfr.append(('X-Spam-Flag: Unsure', mm_cfg.HOLD, False))
+    hfr.append(('X-Spam-Flag: Unsure, tests=bogofilter', mm_cfg.HOLD, False))
     hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.DISCARD, False))
   mlist.Lock()
   mlist.header_filter_rules = hfr