diff options
| author | intrigeri <intrigeri@boum.org> | 2011-05-15 19:29:28 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2011-05-15 19:29:28 +0200 |
| commit | 7757ab245ae9397136b4cdff4f98e4a7cca7dc21 (patch) | |
| tree | 96716645748d2bd6734df5483002047f21b69118 /handlers/rdiff.in | |
| parent | bacaea7ad6a275db9b633c25afbc19f559b97c65 (diff) | |
| parent | 69c0ec09c5e5eb9e166bc0f5c9a1ef702d0150d6 (diff) | |
| download | backupninja-7757ab245ae9397136b4cdff4f98e4a7cca7dc21.tar.gz backupninja-7757ab245ae9397136b4cdff4f98e4a7cca7dc21.tar.bz2 | |
Merge commit 'backupninja-0.9.9' into debian
Diffstat (limited to 'handlers/rdiff.in')
| -rw-r--r-- | handlers/rdiff.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/handlers/rdiff.in b/handlers/rdiff.in index 60386fa..c2f5aa0 100644 --- a/handlers/rdiff.in +++ b/handlers/rdiff.in @@ -115,7 +115,7 @@ fi ### CHECK CONFIG ### # If vservers are configured, check that the ones listed in $vsnames do exist. -local usevserver=no +usevserver=no if [ $vservers_are_available = yes ]; then if [ "$vsnames" = all ]; then vsnames="$found_vservers" @@ -219,7 +219,10 @@ SAVEIFS=$IFS IFS=$(echo -en "\n\b") for i in $exclude; do str="${i//__star__/*}" - execstr="${execstr}--exclude '$str' " + case "$str" in + @*) execstr="${execstr}--exclude-globbing-filelist '${str#@}' " ;; + *) execstr="${execstr}--exclude '$str' " ;; + esac done IFS=$SAVEIFS # includes @@ -228,7 +231,10 @@ IFS=$(echo -en "\n\b") for i in $include; do [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'" str="${i//__star__/*}" - execstr="${execstr}--include '$str' " + case "$str" in + @*) execstr="${execstr}--include-globbing-filelist '${str#@}' " ;; + *) execstr="${execstr}--include '$str' " ;; + esac done IFS=$SAVEIFS |