reportspace: skip non-directories and places that don't exist on the local filesystem...

diff --git a/ChangeLog b/ChangeLog
index 586e3fdc0153380a44f0e5d68b3e3f555c6a0c25..130a54430092c99a8a2118308953f9f1d3089baf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ version 0.9.7 -- UNRELEASED
           preliminary patch (Closes: #511299)
         . new reportinfo option: when set, messages sent by handlers with
           "info" are included in the report e-mail (closes #563734)
+        . reportspace: skip non-directories and places that don't exist on the
+          local filesystem (Closes: #536049)
     lib changes
        easydialog:
         . Allow form fields input to grow up to 100 chars (Closes: #562249)

diff --git a/src/backupninja.in b/src/backupninja.in
index 34021b56ec4350e811e73762e127bc5fa9fc2a98..c3ec7edc6d1f376108320069b9e85f119317b218 100755 (executable)
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -570,7 +570,7 @@ if [ $doit == 1 ]; then
          previous=""
          for i in $(ls "$configdirectory"); do
             backuploc=$(grep ^directory "$configdirectory"/"$i" | @AWK@ '{print $3}')
-            if [ "$backuploc" != "$previous" -a -n "$backuploc" ]; then
+            if [ "$backuploc" != "$previous" -a -n "$backuploc" -a -d "$backuploc" ]; then
                df -h "$backuploc"
                previous="$backuploc"
             fi