do not retickle postponed messages

[etc/mailfilter.git] / procmail / tickle

diff --git a/procmail/tickle b/procmail/tickle
index 1a3388d860617a01b0dcec93eba56ff943352697..896490371b223712998fb8af1ba4bdee09ae80d8 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,11 +1,8 @@
 # The X-Tickle header has priority over the Original-To address
 :0
 # The X-Tickle header has priority over the Original-To address
 :0

+* ! POSTPONED ?? .

 *$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
 *$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+

-{ 
-  TICKLE="$MATCH"
-  :0 fw
-  |$FORMAIL -IX-Tickle
-}
+{ TICKLE="$MATCH" }

 
 :0 E
 * ! POSTPONED ?? .
 
 :0 E
 * ! POSTPONED ?? .


@@ -54,13 +51,20 @@
   JUST_DATE
   DAILY_DELIVERY_TIME
 
   JUST_DATE
   DAILY_DELIVERY_TIME
 

-  LOG="tickle:      delaying message until $DELAY$NL"
+  :0
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+
+  LOG="tickle:      delaying message until $RELEASE$NL"

   DELAYED_QUEUE=$TICKLER_QUEUE
 
   DELAYED_QUEUE=$TICKLER_QUEUE
 

+  :0 fw
+  |$FORMAIL -I"X-Tickle: $RELEASE"
+
+  # store messages as read
+  MARK_READ=true
+

   # unset DISABLE_DELAYS to always enable delaying for tickle messages
   DISABLE_DELAYS
 }
 
   # unset DISABLE_DELAYS to always enable delaying for tickle messages
   DISABLE_DELAYS
 }
 

-TICKLE
-

 # vim:ft=procmail
 # vim:ft=procmail