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

2 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c334bf5..ab5bba3 100644
--- 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 548b789..3aef3f6 100755
--- 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"