diff options
| author | Micah Anderson <micah@riseup.net> | 2008-08-08 04:50:55 +0000 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2008-08-08 04:50:55 +0000 |
| commit | a76cc2f57605db3b3079baccd06c89466b6d2d30 (patch) | |
| tree | eb0adbe9266342424cf1ee2264d2c6c2e122804a | |
| parent | c4f2b1d45ecbd76342d124768b09f9f26a3b6770 (diff) | |
| download | backupninja-a76cc2f57605db3b3079baccd06c89466b6d2d30.tar.gz backupninja-a76cc2f57605db3b3079baccd06c89466b6d2d30.tar.bz2 | |
fix location of deleted_on file and add missing destid_file options in maildir handler
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | handlers/maildir.in | 6 |
2 files changed, 9 insertions, 5 deletions
@@ -1,6 +1,10 @@ version 0.9.7 -- UNRELEASED backupninja changes . fix bug in reportspace, thanks Dan Garthwaite + handler changes + maildir: + . fix location of deleted_on file + . add missing destid_file options to ssh connections version 0.9.6 -- July 21, 2008 backupninja changes @@ -216,7 +220,7 @@ version 0.9.4 -- October 6th, 2006 sshoptions (Closes: #388543) . Now forbid to (try to) include /. sys: - . Many more system checks were added, (thanks to Petr Klíma) + . Many more system checks were added, (thanks to Petr KlĂma) . Added warning if no devices were found (thanks Ranier Zocholl) . Enhanced debian package selections to include purged packages (thanks Tom Hoover) @@ -337,7 +341,7 @@ version 0.9.2 -- December 29, 2005 version 0.9.1 -- November 05 2005 rearranged source so that it is relocatable with autotools - (thanks to Petr Klíma petr.klima@madeta-group.cz) + (thanks to Petr KlĂma petr.klima@madeta-group.cz) fixed many bugs in rdiff helper rdiff handler does not require 'label' (for real this time?) added makecd ninjahelper diff --git a/handlers/maildir.in b/handlers/maildir.in index 3514153..d5731be 100644 --- a/handlers/maildir.in +++ b/handlers/maildir.in @@ -132,12 +132,12 @@ function do_remove() { cd "$srcdir" for userdir in `ls -d1 */`; do ls -1 "$srcdir/$userdir" | sort > $tmp1 - ssh -p $destport $destuser@$desthost ls -1 "$destdir/$userdir" | sort > $tmp2 + ssh -p $destport -i $destid_file $destuser@$desthost ls -1 "$destdir/$userdir" | sort > $tmp2 for deluser in `join -v 2 $tmp1 $tmp2`; do [ "$deluser" != "" ] || continue info "removing $destuser@$desthost:$destdir/$userdir$deluser/" - ssh -p $destport $destuser@$desthost mv "$destdir/$userdir$deluser/" "$destdir/deleted" - ssh -p $destport -i $destid_file $destuser@$desthost "date +%c%n%s > '$destdir/$userdir$deluser/deleted_on'" + ssh -p $destport -i $destid_file $destuser@$desthost mv "$destdir/$userdir$deluser/" "$destdir/deleted" + ssh -p $destport -i $destid_file $destuser@$desthost "date +%c%n%s > '$destdir/deleted/$deluser/deleted_on'" done done rm $tmp1 |