If you include= or exclude= a directory that is actually a symlink

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

diff --git a/handlers/rdiff b/handlers/rdiff
index adc4b5d8e6a6377545d4602cc0ae27e66295e71d..6cbe6faf48ba8cc3a9a2687ede8931185a30af93 100644 (file)
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -109,7 +109,6 @@ if [ $vservers_are_available = yes ]; then
    fi
 else
    [ -z "$vsinclude" ] || warning 'vservers support disabled in backupninja.conf, vsincludes configuration lines will be ignored'
-   [ -z "$vsnames" ] || warning 'vservers support disabled in backupninja.conf, vsnames configuration line will be ignored'   
 fi
 
 # check the connection at the source and destination
@@ -175,12 +174,14 @@ set -o noglob
 # TODO: order the includes and excludes
 # excludes
 for i in $exclude; do
+       i=`readlink -f $i`
        str="${i//__star__/*}"
        execstr="${execstr}--exclude '$str' "
 done
 # includes 
 for i in $include; do
        [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
+       i=`readlink -f $i`
        str="${i//__star__/*}"
        execstr="${execstr}--include '$str' "
 done
@@ -189,7 +190,8 @@ done
 if [ $usevserver = yes ]; then
    for vserver in $vsnames; do
       for vi in $vsinclude; do
-        str="${vi//__star__/*}"
+        i=`readlink -f $VROOTDIR/$vserver$vi`
+        str="${i//__star__/*}"
         execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
       done
    done