improved traps, now db calls log errors

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

diff --git a/procmail/to-gmail b/procmail/to-gmail
index 4909c0c5d425ad2f6cd1c5b2a479a0891d69ee07..05e062764ebc16480d18e6a11b97f65647962a94 100644 (file)
--- a/procmail/to-gmail
+++ b/procmail/to-gmail
@@ -1,11 +1,23 @@
-:0 c
+:0

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

-* !^X-Mailer: swaks

 {
 {

-  LOG="gmail:       archiving message $MSGID with gmail$NL"
-  SENDMAILFLAGS="$SENDMAILFLAGS -f $ID"
-  TRAP=""
+  :0 c
+  *$ ! $MSG_DEJAVU
+  * ! MSG_TEST ?? .
+  {
+    LOG="gmail:       archiving message $MSGID$NL"
+    SENDMAILFLAGS="$SENDMAILFLAGS -f $ID"
+    TRAP

 
 

-  :0
-  ! martin.krafft@gmail.com
+    :0
+    ! martin.krafft@gmail.com
+  }
+
+  :0 E
+  * MSG_TEST ?? .
+  { LOG="gmail:       not archiving message test message$NL" }
+
+  :0 E
+  *$ $MSG_DEJAVU
+  { LOG="gmail:       not archiving message resubmitted message$NL" }

 }
 }