ninjahelper: Recursively ignore subdirs in /etc/backup.d (Finally Closes: #361102)

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

diff --git a/ChangeLog b/ChangeLog
index c334bf577ea5c6fba2613945119ca15b6c6ecb0d..ab5bba30153702d5116bc3dd9d1b09667d0f8ee1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,10 @@
 version 0.9.4 -- unreleased
-       backupninja changes
+    backupninja changes
         . Fixed bug in toint(), and thus isnow(), which caused it
           to not work when run from cron.
-       handler changes
-        Recursively ignore subdirs in /etc/backup.d (Closes: #361102)
-        Added tar handler
+        . Recursively ignore subdirs in /etc/backup.d (Closes: #361102)
+    handler changes
+       Added tar handler
        mysql:
         . Fixed improper use of $vuserhome (Closes: #351083)
         . Fixed erroneous removal of tmpfile when it didn't exit
@@ -31,6 +31,8 @@ version 0.9.4 -- unreleased
        vserver:
         . init_vservers: fixed Debian bug #351083 (improper readlink syntax)
         . found_vservers: escaped special grep repetition character +
+    ninjahelper changes
+        . Recursively ignore subdirs in /etc/backup.d (Closes: #361102)
     changed cron permissions to 644
     minor documentation fixes
 

diff --git a/src/ninjahelper.in b/src/ninjahelper.in
index 548b789afd5b26b8d892d5df1abcdc28d25865a8..3aef3f655aa50973e6dcac3caffb2be69af2fd35 100755 (executable)
--- a/src/ninjahelper.in
+++ b/src/ninjahelper.in
@@ -257,7 +257,7 @@ while true; do
 menulist=
 action=
 let "i = 1"
-for file in `find $conf/etc/backup.d/ -type f | sort -n`; do
+for file in `find $conf/etc/backup.d/ -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`; do
    menulist="$menulist $i $file"
    actions[$i]=$file
    let "i += 1"