projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rdiff: remove TODO comment line, since this has not to be done :)
[matthijs/upstream/backupninja.git]
/
handlers
/
rdiff
diff --git
a/handlers/rdiff
b/handlers/rdiff
index 209606d71de6f22d2445f746ad1e1344f6efe43e..82160f4fb5b03b86a36cdf45a4944611672dc383 100644
(file)
--- a/
handlers/rdiff
+++ b/
handlers/rdiff
@@
-93,15
+93,10
@@
check_consistency "destination" "$type" "$user" "$host"
### CHECK CONFIG ###
# See if vservers are configured
### CHECK CONFIG ###
# See if vservers are configured
-if [ "$vservers" = "yes" ]
-then
- if [ ! -d $VROOTDIR ]
- then
- fatal "vservers enabled, but $VROOTDIR does not exist!"
- else
- info "vserver method enabled"
- usevserver=1
- fi
+local usevserver=no
+if [ $vservers_are_available = yes -a -n "$vsinclude" ]; then
+ info "vserver method enabled"
+ usevserver=yes
fi
# check the connection at the source and destination
fi
# check the connection at the source and destination
@@
-119,7
+114,6
@@
fi
# source specific checks
[ "$include" != "" -o "$vsinclude" != "" ] || fatal "No source includes specified"
# source specific checks
[ "$include" != "" -o "$vsinclude" != "" ] || fatal "No source includes specified"
-#TODO should I test for vsinclude if usevservers=1?
case $sourcetype in
remote ) execstr_sourcepart="$sourceuser@$sourcehost::/" ;;
local ) execstr_sourcepart="/" ;;
case $sourcetype in
remote ) execstr_sourcepart="$sourceuser@$sourcehost::/" ;;
local ) execstr_sourcepart="/" ;;
@@
-165,21
+159,21
@@
execstr="$RDIFFBACKUP $options --print-statistics "
# TODO: order the includes and excludes
# excludes
# TODO: order the includes and excludes
# excludes
-for i in
$exclude
; do
+for i in
"$exclude"
; do
str="${i//__star__/*}"
execstr="${execstr}--exclude '$str' "
done
# includes
str="${i//__star__/*}"
execstr="${execstr}--exclude '$str' "
done
# includes
-for i in
$include
; do
+for i in
"$include"
; do
[ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
str="${i//__star__/*}"
execstr="${execstr}--include '$str' "
done
# vsinclude
[ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
str="${i//__star__/*}"
execstr="${execstr}--include '$str' "
done
# vsinclude
-if [ $usevserver ]; then
+if [ $usevserver
= yes
]; then
for vserver in `ls $VROOTDIR|grep -v lost+found`; do
for vserver in `ls $VROOTDIR|grep -v lost+found`; do
- for vi in
$vsinclude
; do
+ for vi in
"$vsinclude"
; do
str="${vi//__star__/*}"
execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
done
str="${vi//__star__/*}"
execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
done