fix devlivery of messages, now last match wins

[etc/mailfilter.git] / procmail / to-gmail

diff --git a/procmail/to-gmail b/procmail/to-gmail
index ab05e40428304078667f2fb7521666015a193094..59df5cc0753ac7d1482e7f2f96e947f6e38f5535 100644 (file)
--- a/procmail/to-gmail
+++ b/procmail/to-gmail
@@ -1,18 +1,23 @@
-:0 c
+:0

 * ORIG_DOMAIN ?? ^(mass|r2e)\.madduck\.net$
 * ORIG_DOMAIN ?? ^(mass|r2e)\.madduck\.net$

-* !^X-Mailer: swaks

 {
 {

-  :0
+  :0 c

   *$ ! $MSG_DEJAVU
   *$ ! $MSG_DEJAVU

+  * ! MSG_TEST ?? .

   {
     LOG="gmail:       archiving message $MSGID with gmail$NL"
     SENDMAILFLAGS="$SENDMAILFLAGS -f $ID"
   {
     LOG="gmail:       archiving message $MSGID with gmail$NL"
     SENDMAILFLAGS="$SENDMAILFLAGS -f $ID"

-    TRAP=""
+    TRAP

 
     :0
     ! martin.krafft@gmail.com
   }
 
   :0 E
 
     :0
     ! martin.krafft@gmail.com
   }
 
   :0 E

+  * MSG_TEST ?? .
+  { LOG="gmail:       not archiving message test message with gmail$NL" }
+
+  :0 E
+  *$ $MSG_DEJAVU

   { LOG="gmail:       not archiving message resubmitted message with gmail$NL" }
 }
   { LOG="gmail:       not archiving message resubmitted message with gmail$NL" }
 }