diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | handlers/rdiff.in | 10 |
3 files changed, 16 insertions, 3 deletions
@@ -21,7 +21,7 @@ garcondumonde@riseup.net Martin Krafft madduck@debian.org -- admingroup patch Anarcat -- lotsa patches Jamie McClelland -- cstream patches -ale -- ldap cleanup +ale -- ldap cleanup, rdiff support for reading include/exclude from files Sami Haahtinen <ressu@ressukka.net> Matthew Palmer -- mysql enhancements romain.tartiere@healthgrid.org -- ldap fixes @@ -1,3 +1,10 @@ +version 0.9.9 -- UNRELEASED + handler changes + rdiff: + . Support reading include/exclude patterns from files using the + "include @/etc/backup_includes" syntax (Closes Roundup bug + #2370). Thanks to ale for the patch. + version 0.9.8 -- September 12, 2010 backupninja changes . Added GZIP_OPTS option, defaulting to --rsyncable, so that this diff --git a/handlers/rdiff.in b/handlers/rdiff.in index 60386fa..e391edd 100644 --- a/handlers/rdiff.in +++ b/handlers/rdiff.in @@ -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 |