From: Micah Anderson Date: Sat, 11 Mar 2006 07:22:44 +0000 (+0000) Subject: Fixed the include=/exclude= improper dereference problem in the dup handler X-Git-Tag: backupninja-0.9.4~75 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=0137962360bd449b4699e06bc9fad6285492f3a9;p=matthijs%2Fupstream%2Fbackupninja.git Fixed the include=/exclude= improper dereference problem in the dup handler --- diff --git a/ChangeLog b/ChangeLog index a6fb5e5..5f4eb4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ version 0.9.4 -- unreleased . Fixed erroneous removal of tmpfile when it didn't exit rdiff: . Fixed improper include/exclude symlink dereference + dup: + . Fixed improper include/exclude symlink dereference lib changes vserver: . init_vservers: fixed Debian bug #351083 (improper readlink syntax) diff --git a/handlers/dup b/handlers/dup index 6918702..227ba8b 100644 --- a/handlers/dup +++ b/handlers/dup @@ -118,12 +118,14 @@ set -o noglob # 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=`readlink -f $i` str="${i//__star__/*}" execstr="${execstr}--include '$str' " done @@ -132,7 +134,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