From 472c86d6a20722f8e1d477ff9faaa5b9db21f513 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 24 Feb 2006 09:41:44 +0100 Subject: [PATCH] Fix bug, when rsync exits non-zero --- ccollect.sh | 3 +-- doc/ccollect.html | 33 ++++++++++++++++++++++++--------- doc/ccollect.text | 2 +- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/ccollect.sh b/ccollect.sh index 4903c2f..b655189 100755 --- a/ccollect.sh +++ b/ccollect.sh @@ -367,10 +367,9 @@ while [ "$i" -lt "$no_shares" ]; do if [ "$?" -ne 0 ]; then echo "rsync reported an error. The backup may be broken (see rsync errors)" - exit 1 fi - echo "$(date) Successfully finished backup" + echo "$(date) Finished backup" # # post_exec diff --git a/doc/ccollect.html b/doc/ccollect.html index 1133403..fae487c 100644 --- a/doc/ccollect.html +++ b/doc/ccollect.html @@ -262,8 +262,8 @@ div.exampleblock-content {

ccollect - Installing, Configuring and Using

Nico Schottelius
<nico-linux-ccollect__@__schottelius.org>
-version 0.3.2, -for ccollect 0.3.2, Initial Version from 2005-01-13 +version 0.3.3, +for ccollect 0.3.2-0.3.3, Initial Version from 2006-01-13
@@ -444,7 +444,7 @@ human readable format before and after the whole backup process:

  • -rsync_options' extra options to pass to `rsync +rsync_options extra options to pass to rsync

  • @@ -483,7 +483,8 @@ human readable format before and after the whole backup process:

    source describes a rsync compatible source (one line only).

    For instance backup_user@foreign_host:/home/server/video. To use the rsync protocol without the ssh-tunnel, use -rsync::USER@HOST/SRC. For more information have a look at rsync(1).

    +rsync::USER@HOST/SRC. For more information have a look at the manpage +of rsync,rsync(1).

    4.3.2. Detailled description of "verbose"

    verbose tells ccollect that the log should contain verbose messages.

    If this file exists in the source specification -v will be passed to rsync.

    @@ -701,9 +702,23 @@ an already written script

    6. F.A.Q.

    6.1. What happens, if one backup is broken or empty?

    -

    Let us assume, that one backup failed (connection broke or hard disk had -some failures). So we've one backup in our history, which is incomplete.

    -

    The next time you use ccollect, it will transfer the missing files

    +

    Let us assume, that one backup failed (connection broke or the source +hard disk had some failures). So we've one backup in our history, +which is incomplete.

    +

    The next time you use ccollect, it will transfer the missing files. +This leads to

    +
      +
    • +

      +more transferred files +

      +
      • +
    • +

      +much greater disk space usage, as no hardlinks can be used +

      +
      • +

    6.2. When backing up from localhost the destination is also included. Is this a bug?

    No. ccollect passes your source definition directly to rsync. It does not try to analyze it. So it actually does not know if a source @@ -836,8 +851,8 @@ the hardlinks allocate.

    diff --git a/doc/ccollect.text b/doc/ccollect.text index ced4ad5..b86eddc 100644 --- a/doc/ccollect.text +++ b/doc/ccollect.text @@ -1,7 +1,7 @@ ccollect - Installing, Configuring and Using ============================================ Nico Schottelius -0.3.3, for ccollect 0.3.2, Initial Version from 2006-01-13 +0.3.3, for ccollect 0.3.2-0.3.3, Initial Version from 2006-01-13 :Author Initials: NS (pseudo) incremental backup