From d395ae94a5657afcc878adcd851d8e8c53df98de Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 7 Oct 2006 00:40:58 +0000
Subject: dup, rdiff: implemented and documented simpler and clearer
 symlinks/globbing behaviour, as proposed on
 http://lists.riseup.net/www/arc/backupninja/2006-07/msg00008.html

---
 handlers/rdiff | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'handlers/rdiff')

diff --git a/handlers/rdiff b/handlers/rdiff
index 79577c6..bdc1cbd 100644
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -179,23 +179,13 @@ 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
 
 # vsinclude
@@ -203,7 +193,7 @@ if [ $usevserver = yes ]; then
    for vserver in $vsnames; do
       for vi in $vsinclude; do
 	 str="${vi//__star__/*}"
-	 str=`readlink -f $VROOTDIR/$vserver$str`
+	 str="$VROOTDIR/$vserver$str"
          if [ -n "$str" ]; then
 	    execstr="${execstr}--include '$str' "
          else
-- 
cgit v1.2.3