move the branches directories up to the root of the repository

[matthijs/upstream/backupninja.git] / handlers / dup.in

diff --git a/handlers/dup.in b/handlers/dup.in
index 2854974d43a49e906ef735571e44a0ba325f4f31..00f4b58b7a8a7147127a85db87717c04843fb741 100644 (file)
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -24,7 +24,6 @@ getconf exclude
 setsection dest
 getconf incremental yes
 getconf keep 60
-getconf desturl
 getconf sshoptions
 getconf bandwidthlimit 0
 getconf desthost
@@ -34,8 +33,8 @@ destdir=${destdir%/}
 
 ### SANITY CHECKS ##############################################################
 
-[ -n "$desturl" -o -n "$destdir" ]  || fatal "The destination directory (destdir) must be set when desturl is not used."
-[ -n "$include" -o -n "$vsinclude" ]  || fatal "No source includes specified"
+[ -n "$destdir" ]  || fatal "Destination directory not set"
+[ -n "$include" ]  || fatal "No source includes specified"
 [ -n "$password" ] || fatal "The password option must be set."
 
 ### VServers
@@ -59,17 +58,13 @@ fi
 
 ### See if we can login on $desthost
 if [ "$testconnect" == "yes" ]; then
-   if [ -n "$desturl" ]; then
-      warning 'testconnect can not be used when desturl is set'
-   else
-      debug "ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'"
-      if [ ! $test ]; then
-         result=`ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'`
-         if [ "$result" != "1" ]; then
-           fatal "Can't connect to $desthost as $destuser."
-         else
-           debug "Connected to $desthost as $destuser successfully"
-         fi
+   debug "ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'"
+   if [ ! $test ]; then
+      result=`ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'`
+      if [ "$result" != "1" ]; then
+        fatal "Can't connect to $desthost as $destuser."
+      else
+        debug "Connected to $desthost as $destuser successfully"
       fi
    fi
 fi
@@ -80,14 +75,7 @@ fi
 execstr_command=
 execstr_options="$options --no-print-statistics"
 execstr_source=
-if [ -n "$desturl" ]; then
-   [ -z "$destuser" ] || warning 'the configured destuser is ignored since desturl is set'
-   [ -z "$desthost" ] || warning 'the configured desthost is ignored since desturl is set'
-   [ -z "$destdir" ] || warning 'the configured destdir is ignored since desturl is set'
-   execstr_serverpart="$desturl"
-else
-   execstr_serverpart="scp://$destuser@$desthost/$destdir"
-fi
+execstr_serverpart="scp://$destuser@$desthost/$destdir"
 
 ### duplicity version
 duplicity_version="`duplicity --version | @AWK@ '{print $2}'`"
@@ -105,10 +93,7 @@ duplicity_sub="`echo $duplicity_version | @AWK@ -F '.' '{print $3}'`"
 #    --sftp-command ourselves
 
 scpoptions="$sshoptions"
-if [ "$bandwidthlimit" =! 0 ]; then
-   [ -z "$testurl" ] || warning 'The bandwidthlimit option is not used when desturl is set.'
-   scpoptions="$scpoptions -l $bandwidthlimit"
-fi
+[ "$bandwidthlimit" == 0 ] || scpoptions="$scpoptions -l $bandwidthlimit"
 
 # < 0.4.2 : only uses ssh and scp
 if [ "$duplicity_major" -le 0 -a "$duplicity_minor" -le 4 -a "$duplicity_sub" -lt 2 ]; then