fix regexp to avoid extracting sfid with msgid

[etc/mailfilter.git] / procmail / delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index cfe3403fad23061460a6b48d55141d6674593f18..65f02e5eb64b3053662fc4aec0f4a7eb8e0c7145 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,11 +1,20 @@
 #TODO: create config/delay-(disabled|tonight|weekend)
 
-:0 fw
+:0
 * POSTPONED ?? .
-|$FORMAIL -R X-Postponed X-Was-Postponed
+{
+  LOG="delay:       not delaying already-postponed message$NL"
+  :0 fw
+  |$FORMAIL -R X-Postponed X-Was-Postponed
+}
+
+:0 E
+* DISABLE_DELAYS ?? .
+{
+  LOG="delay:       delays disabled, thus not delaying$NL"
+}
 
 :0 E
-* ! DISABLE_DELAYS ?? .
 * DELAY ?? .
 {
   #TODO: for tickling, use header date
@@ -24,10 +33,11 @@
     { RELEASE_TIME="$MATCH" }
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
-    POSTPONED="$RELEASE_TS ($RELEASE_TIME)"
 
-    INCLUDERC=$PMDIR/record-delayed-mail
+    :0 fw
+    |$FORMAIL -I"X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
 
+    INCLUDERC=$PMDIR/record-delayed-mail
     :0
     $DELAYED_QUEUE
   }