jaromail

commit 4a73713ce0ab0c9af5e62d34c90be9ee59a9201c
parent 6076b833029ffd01a751e6b4168470609a420198
Author: Jaromil <jaromil@dyne.org>
Date:   Tue,  5 Jun 2012 12:25:03 +0200

important bugfix to mailinglist and priv filters

Diffstat:
M
src/jaro
 | 
17
+++++++++++------

1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/jaro b/src/jaro
@@ -166,7 +166,7 @@ ps ax | grep '[g]nome-keyring-daemon' > /dev/null
 cleanexit() {
     func "Clean exit procedures"
     for f in `ls $TMPDIR/ | grep -v '.lock$'`; do
-	unlink $TMPDIR/$f
+	{ test -r $TMPDIR/$f } && { unlink $TMPDIR/$f }
     done
 #    { test $TMPRAM = 1 } && { rmdir $TMPDIR }
     unset typeset -h name login host protocol port password auth folders accountopt
@@ -1060,6 +1060,11 @@ EOF
     cat <<EOF >> $PROCMAILDIR/rc
 }
 
+:0
+* PF_DEST ?? .
+* ? test \$PMSRC/pf-save.rc
+{ INCLUDERC=\$PMSRC/pf-save.rc }
+
 # whitelisting filters using lbdb
 :0 w:
 * ? formail -x"From:" | head -n1 | tr 'A-Z' 'a-z' | sed 's/.*\W\([0-9a-z_.-]\+@[0-9a-z_.-]\+\).*/\1/' | xargs \$JARO -l Whitelist.txt -q query
@@ -1082,6 +1087,11 @@ EOF
     cat <<EOF >> $PROCMAILDIR/rc
 }
 
+:0
+* PF_DEST ?? .
+* ? test \$PMSRC/pf-save.rc
+{ INCLUDERC=\$PMSRC/pf-save.rc }
+
 # if its an unknown mailinglist, save it into ml.unsorted
 :0
 * ^(List-Id|X-(Mailing-)?List):
@@ -1101,11 +1111,6 @@ EOF
     cat <<EOF >> $PROCMAILDIR/rc
 
 # if got here, go to unsorted
-# the command below actually save the mails
-:0
-* PF_DEST ?? .
-* ? test \$PMSRC/pf-save.rc
-{ INCLUDERC=\$PMSRC/pf-save.rc }
 
 #
 # End of generated procmail rc