label is no longer required (now this works with ninjahelper without problems)

[matthijs/upstream/backupninja.git] / handlers / rdiff

diff --git a/handlers/rdiff b/handlers/rdiff
index bec59ff69a8ff065be9a5ad1ab264650d7292ba3..40ad52dd585dbbcc836872db4a11c2275fc3e3f5 100644 (file)
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -43,8 +43,8 @@ if [ "$desttype" == "remote" ]; then
        # see if we can login
        if [ "$testconnect" == "yes" ]; then
                hostalive=0
-           debug "ssh -o -o PreferredAuthentications=publickey $desthost -l $destuser 'echo -n 1'"
-               ret=`ssh -o -o PreferredAuthentications=publickey $desthost -l $destuser 'echo -n host is alive'`
+           debug "ssh -o PreferredAuthentications=publickey $desthost -l $destuser 'echo -n 1'"
+               ret=`ssh -o PreferredAuthentications=publickey $desthost -l $destuser 'echo -n host is alive'`
                if echo $ret | grep "host is alive"; then
                        debug "Connected to $desthost as $destuser successfully"
                else
@@ -65,7 +65,6 @@ fi
 
 ### SOURCE ###
 
-[ "$label" != "" ] || fatal "Source missing label"
 [ "$sourcetype" == "local" ] || fatal "Only local source type supported"
 [ "$include" != "" -o "$vsinclude" != "" ] || fatal "No source includes specified"
 #TODO should I test for vsinclude if usevservers=1?
@@ -118,7 +117,7 @@ done
 # vsinclude
 if [ $usevserver ] 
 then
-       for vserver in `ls $VROOTDIR|grep -v lost+found`
+       for vserver in `ls $VROOTDIR | grep -E -v "lost+found|ARCHIVES"`
        do
                for vi in $vsinclude
                do
@@ -140,10 +139,10 @@ if [ ! $test ]; then
        code=$?
        if [ "$code" == "0" ]; then
                debug $output
-               info "Successfully finished backing up source '$label'"
+               info "Successfully finished backing up source $label"
        else
                warning $output
-               warning "Failed backup up source '$label'"
+               warning "Failed backup up source $label"
        fi
 fi