projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sys: fix bug when vrootdir is on its own partition
[matthijs/upstream/backupninja.git]
/
handlers
/
rdiff
diff --git
a/handlers/rdiff
b/handlers/rdiff
index 79577c655ebd9c9c76e1b77d993281e18ff84ba5..bdc1cbd25ddc7eb3b4916eea96794bfd57873db1 100644
(file)
--- 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__/*}"
# 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__/*}"
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
done
# vsinclude
@@
-203,7
+193,7
@@
if [ $usevserver = yes ]; then
for vserver in $vsnames; do
for vi in $vsinclude; do
str="${vi//__star__/*}"
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
if [ -n "$str" ]; then
execstr="${execstr}--include '$str' "
else