dup, rdiff: implemented and documented simpler and clearer symlinks/globbing

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

diff --git a/handlers/dup b/handlers/dup
index b4a7c9db3bc722bb15c5ff58007a89d3e02e3e72..15d1a02f0c5e79699d95e174be9c04bf0b6c9cc2 100644 (file)
--- a/handlers/dup
+++ b/handlers/dup
@@ -134,24 +134,14 @@ symlinks_warning="Maybe you have mixed symlinks and '*' in this statement, which
 # excludes
 for i in $exclude; do
    str="${i//__star__/*}"
-   str=`readlink -f $str`
-   if [ -n "$str" ]; then
-      execstr="${execstr}--exclude '$str' "
-   else
-      warning "exclude statement '${i//__star__/*}' will be ignored. $symlinks_warning"
-   fi
+   execstr="${execstr}--exclude '$str' "
 done
        
 # includes 
 for i in $include; do
    [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
    str="${i//__star__/*}"
-   str=`readlink -f $str`
-   if [ -n "$str" ]; then
-      execstr="${execstr}--include '$str' "
-   else
-      warning "include statement '${i//__star__/*}' will be ignored. $symlinks_warning"
-   fi
+   execstr="${execstr}--include '$str' "
 done
 
 # vsincludes
@@ -159,12 +149,8 @@ if [ $usevserver = yes ]; then
    for vserver in $vsnames; do
       for vi in $vsinclude; do
         str="${vi//__star__/*}"
-        str=`readlink -f $VROOTDIR/$vserver$str`
-         if [ -n "$str" ]; then
-           execstr="${execstr}--include '$str' "
-         else
-            warning "vsinclude statement '${vi//__star__/*}' will be ignored for VServer $vserver. $symlinks_warning"
-         fi
+        str="$VROOTDIR/$vserver$str"
+        execstr="${execstr}--include '$str' "
       done
    done
 fi