Include intelligent cloning

This commit is contained in:
Nico Schottelius 2007-08-17 23:31:45 +02:00
parent 6d01706aea
commit 2c80eab8e1
2 changed files with 12 additions and 27 deletions

View file

@ -333,9 +333,6 @@ while [ "${i}" -lt "${no_sources}" ]; do
DELETE_INCOMPLETE="yes"
fi
#
# Verbosity for rsync
# NEW method as of 0.6:
# - insert ccollect default parameters
# - insert options
@ -422,36 +419,24 @@ while [ "${i}" -lt "${no_sources}" ]; do
#
# Check for backup directory to clone from
# Check for backup directory to clone from: Always clone from the latest one!
#
# Use ls -1c instead of -1t, because last modification maybe the same on all
# and metadate update (-c) is updated by rsync locally.
#
# try our interval
last_dir="$(ls -d "${c_dest}/${INTERVAL}."?* 2>/dev/null | sort -n | tail -n 1)"
# try other intervals, if there's none four our interval
if [ -z "${last_dir}" ]; then
_techo "Did not find existing backups for interval ${INTERVAL}."
# get list
: > "${TMP}"
( cd "${backup}/intervals/" 2>/dev/null && ls >> "${TMP}" )
( cd "${CDEFAULTS}/intervals/" 2>/dev/null && ls >> "${TMP}" )
# FIXME in 0.6.1: choose best source, not first one.
while read other_interval; do
last_dir="$(ls -d "${c_dest}/${other_interval}."?* 2>/dev/null | sort -n | tail -n 1)"
if [ "${last_dir}" ]; then
_techo "Using backup from ${other_interval}."
break
fi
done < "${TMP}"
fi
set -x
#last_dir="$(ls -d "${c_dest}/${INTERVAL}."?* 2>/dev/null | sort -n | tail -n 1)"
last_dir="$(cd "${c_dest}" && ls -pc1 | grep '/$' | tail -n 1)" || \
_exit_err "Failed to list contents of ${c_dest}."
set +x
#
# clone from old backup, if existing
#
if [ "${last_dir}" ]; then
abs_last_dir="$(cd "${last_dir}" && pwd -P)" || _exit_err "Could not change to last dir ${last_dir}."
abs_last_dir="$(cd "${last_dir}" && pwd -P)" || \
_exit_err "Could not change to last dir ${last_dir}."
set -- "$@" "--link-dest=${abs_last_dir}"
fi

View file

@ -9,4 +9,4 @@
- add --version, -V
- add source/ignore_failed_pre_exec
- add source/ignore_failed_post_exec
- .ccollect-marker is deleted by rsync at the beginning!