]> git.madduck.net Git - etc/mailfilter.git/blobdiff - bin/process-delayed-queue

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

do not delay ul mail
[etc/mailfilter.git] / bin / process-delayed-queue
index e978a40aacc9125166a658b7544d095390748fb8..826a346ec6a9c68b662d9deb240eada8af74825b 100755 (executable)
@@ -8,7 +8,7 @@ RESUBMIT=$HOME/.etc/mailfilter/bin/resubmit
 
 DELAYED_QUEUE_DB=$HOME/.var/procmail/delayed-queue.sqlite
 
-QUERY='select * from messages where release_ts < strftime("%s", "now")'
+QUERY='select * from messages where release_ts <= strftime("%s", "now")'
 
 $SQLITE -list -separator ' ' $DELAYED_QUEUE_DB "$QUERY" \
   | while read msgid basefile ts; do
@@ -20,9 +20,9 @@ $SQLITE -list -separator ' ' $DELAYED_QUEUE_DB "$QUERY" \
     dirname="${file%/*}"
     case "${dirname##*/}" in
       cur)
-        files="$files ${file}:2,S"
+        files="$files ${file}:2,S ${file}:2,R ${file}:2,RS"
         file="${dirname%/cur}/new/$basename"
-        files="$files $file ${file}:2,"
+        files="$files $file ${file}:2, ${file}:2,R ${file}:2,RS"
         ;;
       new)
         file="${dirname%/new}/cur/$basename"