diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | handlers/rdiff | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -4,6 +4,8 @@ version 0.9.4 -- unreleased mysql: . Fixed improper use of $vuserhome (Debian: #351083) . Fixed erroneous removal of tmpfile when it didn't exit + rdiff: + . Fixed improper include/exclude symlink dereference lib changes vserver: . init_vservers: fixed Debian bug #351083 (improper readlink syntax) diff --git a/handlers/rdiff b/handlers/rdiff index 4871d4e..6cbe6fa 100644 --- a/handlers/rdiff +++ b/handlers/rdiff @@ -174,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 @@ -188,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 |