added force to hard link cp

ignore rsync error code 24
ignore cp return code.

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

diff --git a/handlers/maildir b/handlers/maildir
index 6da5c0f08f5a7c6baf76283156d302a21e8da864..0af8ff7c7d66e320cc6c5f5c84c80ea6c66c2a4a 100644 (file)
--- a/handlers/maildir
+++ b/handlers/maildir
@@ -85,7 +85,9 @@ function do_user() {
 --exclude '.Trash/*' --exclude '.Mistakes/*' --exclude '.Spam/*' \
 $dir $destuser@$desthost:$destdir/$letter \
 2>&1`
-       if [ $? != 0 ]; then
+       ret=$?
+       # ignore 0 (success) and 24 (file vanished before it could be copied)
+       if [ $ret != 0 -a $ret != 24 ]; then
                warning "rsync $user failed"
                warning "  returned: $ret"
                let "failedcount = failedcount + 1"
@@ -241,11 +243,11 @@ function setup_remote_dirs() {
                        fi
                        if [ -d $destdir/$backuptype.2 ]; then
                                echo "Info: updating hard links to $dir.1. This may take a while."
-                               cp -al $destdir/$backuptype.2/. $dir.1
-                               if [ \$? == 1 ]; then
-                                       echo "Fatal: could not create hard links to $dir.1 on host $desthost"
-                                       exit 1
-                               fi
+                               cp -alf $destdir/$backuptype.2/. $dir.1
+                               #if [ \$? == 1 ]; then
+                               #       echo "Fatal: could not create hard links to $dir.1 on host $desthost"
+                               #       exit 1
+                               #fi
                        fi
                fi
                [ -f $dir.1/created ] && rm $dir.1/created