Skip to content
Snippets Groups Projects
Commit 01379623 authored by micah's avatar micah :speech_balloon:
Browse files

Fixed the include=/exclude= improper dereference problem in the dup handler

parent dc8e99c6
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,8 @@ version 0.9.4 -- unreleased ...@@ -6,6 +6,8 @@ version 0.9.4 -- unreleased
. Fixed erroneous removal of tmpfile when it didn't exit . Fixed erroneous removal of tmpfile when it didn't exit
rdiff: rdiff:
. Fixed improper include/exclude symlink dereference . Fixed improper include/exclude symlink dereference
dup:
. Fixed improper include/exclude symlink dereference
lib changes lib changes
vserver: vserver:
. init_vservers: fixed Debian bug #351083 (improper readlink syntax) . init_vservers: fixed Debian bug #351083 (improper readlink syntax)
......
...@@ -118,12 +118,14 @@ set -o noglob ...@@ -118,12 +118,14 @@ set -o noglob
# excludes # excludes
for i in $exclude; do for i in $exclude; do
i=`readlink -f $i`
str="${i//__star__/*}" str="${i//__star__/*}"
execstr="${execstr}--exclude '$str' " execstr="${execstr}--exclude '$str' "
done done
# includes # includes
for i in $include; do for i in $include; do
i=`readlink -f $i`
str="${i//__star__/*}" str="${i//__star__/*}"
execstr="${execstr}--include '$str' " execstr="${execstr}--include '$str' "
done done
...@@ -132,7 +134,8 @@ done ...@@ -132,7 +134,8 @@ done
if [ $usevserver = yes ]; then if [ $usevserver = yes ]; then
for vserver in $vsnames; do for vserver in $vsnames; do
for vi in $vsinclude; do for vi in $vsinclude; do
str="${vi//__star__/*}" i=`readlink -f $VROOTDIR/$vserver$vi`
str="${i//__star__/*}"
execstr="${execstr}--include '$VROOTDIR/$vserver$str' " execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
done done
done done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment