r3546@krups: intrigeri | 2005-11-14 20:32:59 +0100

 Fix: used to expand '*' in default source directories

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@230 758a04ac-41e6-0310-8a23-8373a73cc35d

diff --git a/ChangeLog b/ChangeLog
index 7f034c65b24ade8ddec42f0c46e7e7cffbabf36e..685e75c126f25c9d1d3819e1146250f3fa214c32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 version 0.9.2 -- unreleased 
        fixed missing makecd.helper in Makefile.am/.in
+       rdiff ninjahelper bugfixed:
+               used to expand '*' in default source directories
 
 version 0.9.1 -- November 05 2005
        rearranged source so that it is relocatable with autotools
@@ -52,7 +54,7 @@ version 0.8 -- September 15 2005
                now checks if "postgres" user exists on the host/vserver.
        changes to ninjahelper
                check_perms() does not die anymore on group/world readable
-       helper scripts (now consistent with the "helper scripts
+               helper scripts (now consistent with the "helper scripts
                must not be group or world writable!" error msg).
        xedit action now tries $EDITOR, then /etc/alternatives/editor,
                then nano, vim and vi, and aborts if none of these exists.

diff --git a/handlers/rdiff.helper b/handlers/rdiff.helper
index 0bd982c3d415b3b6d79689c13e6f10c273936750..91d715e73261908fbc523071bbc4538f46685427 100644 (file)
--- a/handlers/rdiff.helper
+++ b/handlers/rdiff.helper
@@ -294,8 +294,10 @@ rdiff_wizard() {
   rdiff_directory=/backup/`hostname`
   rdiff_user=
   rdiff_host=
+  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)
+  set +o noglob
   rdiff_main_menu
 }