fixed bug where maildirs that start with a number were skipped. make deleted maildirs...

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@556 758a04ac-41e6-0310-8a23-8373a73cc35d

diff --git a/handlers/maildir.in b/handlers/maildir.in
index 34668fb66e7e214c3c57fc0c2bb09c856bf9d673..5922d1ebec4e710afbb5393583bfc9c8ce65424e 100644 (file)
--- a/handlers/maildir.in
+++ b/handlers/maildir.in
@@ -52,7 +52,7 @@ getconf destuser
 
 getconf multiconnection notset
 
-letters="a b c d e f g h i j k l m n o p q r s t u v w x y z"
+letters="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v w x y z"
 failedcount=0
 # strip trailing /
 destdir=${destdir%/}
@@ -111,13 +111,14 @@ function do_remove() {
        local tmp2=`maketemp maildir-tmp-file`
        
        ssh -p $destport $destuser@$desthost mkdir -p "$destdir/deleted"
-       for i in a b c d e f g h i j k l m n o p q r s t u v w x y z; do
+       for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v w x y z; do
                ls -1 "$srcdir/$i/" | sort > $tmp1
                ssh -p $destport $destuser@$desthost ls -1 "$destdir/$i/" | sort > $tmp2
                for deluser in `join -v 2 $tmp1 $tmp2`; do
                        [ "$deluser" != "" ] || continue
                        info "removing $destuser@$desthost:$destdir/$i/$deluser/"
                        ssh -p $destport $destuser@$desthost mv "$destdir/$i/$deluser/" "$destdir/deleted"
+                       ssh -p $destport $destuser@$desthost "date > '$destdir/$i/$deluser/deleted_on'"
                done
        done
        rm $tmp1