From: intrigeri <intrigeri@boum.org>
Date: Tue, 5 Jan 2010 13:34:30 +0000 (+0100)
Subject: reportspace: skip non-directories and places that don't exist on the local filesystem... 
X-Git-Tag: backupninja-0.9.7~10
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=commitdiff_plain;h=49bfd02bd3ee6eccc2eaa0a7c668c46b4a15af0a;hp=172b0e3341cb60ffed14eea306373d696dacc600

reportspace: skip non-directories and places that don't exist on the local filesystem (Closes: #536049)
---

diff --git a/ChangeLog b/ChangeLog
index 586e3fd..130a544 100644
--- 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 34021b5..c3ec7ed 100755
--- 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