From b014c00d2467996713b094ec8a0cd01760266d86 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@ikn.schottelius.org>
Date: Mon, 27 Jul 2009 09:16:35 +0200
Subject: [PATCH] Remove double code imported with merge

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
---
 ccollect.sh | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/ccollect.sh b/ccollect.sh
index 62bfb84..e7ac7fb 100755
--- a/ccollect.sh
+++ b/ccollect.sh
@@ -287,7 +287,7 @@ while [ "${i}" -lt "${no_sources}" ]; do
    c_post_exec="${backup}/post_exec"
    for opt in exclude verbose very_verbose rsync_options summary delete_incomplete \
          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\"
       else
          eval c_$opt=\"${CDEFAULTS}/$opt\"
@@ -307,18 +307,7 @@ while [ "${i}" -lt "${no_sources}" ]; do
    c_marker=".ccollect-marker"
 
    #
-   # Read possible options
-   #
-   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
+   # First execute pre_exec, which may generate destination or other parameters
    #
    if [ -x "${c_pre_exec}" ]; then
       _techo "Executing ${c_pre_exec} ..."