diff options
author | intrigeri <intrigeri@boum.org> | 2010-08-26 02:04:13 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2010-08-26 02:04:13 +0200 |
commit | 93041732b3ccffa113693af8480d69fc080d9ec1 (patch) | |
tree | b2950b49cba6a22b448a7e88819c2ac6c26847ad /handlers/rdiff.helper.in | |
parent | e6c65815c8201d123f477e05a367832204c39886 (diff) | |
parent | 40155781065eb7254eb9fc9c48bd85b0b8ace4c0 (diff) | |
download | backupninja-93041732b3ccffa113693af8480d69fc080d9ec1.tar.gz backupninja-93041732b3ccffa113693af8480d69fc080d9ec1.tar.bz2 |
Merge branch 'master' into debian
Conflicts:
examples/example.ldap
Diffstat (limited to 'handlers/rdiff.helper.in')
-rw-r--r-- | handlers/rdiff.helper.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/handlers/rdiff.helper.in b/handlers/rdiff.helper.in index e35d629..b5bb8bb 100644 --- a/handlers/rdiff.helper.in +++ b/handlers/rdiff.helper.in @@ -415,7 +415,7 @@ rdiff_wizard() { # Global variables whose '*' shall not be expanded set -o noglob rdiff_includes=(/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*) - rdiff_excludes=(/home/*/.gnupg /home/*/.local/share/Trash /home/*/.Trash /home/*/.thumbnails /home/*/.beagle /home/*/.aMule /home/*/gtk-gnutella-downloads) + rdiff_excludes=(/home/*/.gnupg /home/*/.local/share/Trash /home/*/.Trash /home/*/.thumbnails /home/*/.beagle /home/*/.aMule /home/*/gtk-gnutella-downloads /var/cache/backupninja/duplicity) rdiff_vsincludes= set +o noglob |