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

diff --git a/ChangeLog b/ChangeLog
index 5c23aa935fe83e67a3853bcbc54bfef1edfa1812..b1db818eab5fb34a5a8a66dfe88b4fa00e160853 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 version 0.9.4 -- unreleased
+    backupninja changes
+       Recursively ignore subdirs in /etc/backup.d (Closes: #361102)
     handler changes
        mysql:
         . Fixed improper use of $vuserhome (Debian: #351083)

diff --git a/src/backupninja.in b/src/backupninja.in
index b0766eb17f62f6108744bb71f8c1ad37538738d3..2835a3c55950381b051c338050d1d968112eb77b 100755 (executable)
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -455,7 +455,7 @@ errormsg=""
 if [ "$singlerun" ]; then
        files=$singlerun
 else
-       files=`find $configdirectory -mindepth 1 ! -name '.*.swp' | sort -n`
+       files=`find $configdirectory -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`
 fi
 
 for file in $files; do