Remove double code imported with merge

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
This commit is contained in:
Nico Schottelius 2009-07-27 09:16:35 +02:00
parent d61c9625f4
commit b014c00d24

View file

@ -287,7 +287,7 @@ while [ "${i}" -lt "${no_sources}" ]; do
c_post_exec="${backup}/post_exec" c_post_exec="${backup}/post_exec"
for opt in exclude verbose very_verbose rsync_options summary delete_incomplete \ for opt in exclude verbose very_verbose rsync_options summary delete_incomplete \
remote_host rsync_failure_codes mtime quiet_if_down ; do remote_host rsync_failure_codes mtime quiet_if_down ; do
if [ -f "${backup}/${opt}" -o -f "${backup}/no_${opt}" ]; then if [ -f "${backup}/${opt}" -o -f "${backup}/no_${opt}" ]; then
eval c_$opt=\"${backup}/$opt\" eval c_$opt=\"${backup}/$opt\"
else else
eval c_$opt=\"${CDEFAULTS}/$opt\" eval c_$opt=\"${CDEFAULTS}/$opt\"
@ -307,18 +307,7 @@ while [ "${i}" -lt "${no_sources}" ]; do
c_marker=".ccollect-marker" c_marker=".ccollect-marker"
# #
# Read possible options # First execute pre_exec, which may generate destination or other parameters
#
for opt in exclude verbose very_verbose rsync_options summary delete_incomplete remote_host ; do
if [ -f "${backup}/${opt}" -o -f "${backup}/no_${opt}" ]; then
eval c_$opt=\"${backup}/$opt\"
else
eval c_$opt=\"${CDEFAULTS}/$opt\"
fi
done
#
# first execute pre_exec, which may generate destination or other parameters
# #
if [ -x "${c_pre_exec}" ]; then if [ -x "${c_pre_exec}" ]; then
_techo "Executing ${c_pre_exec} ..." _techo "Executing ${c_pre_exec} ..."