fix reportspace

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

diff --git a/AUTHORS b/AUTHORS
index 145fa02dfc597d58e3f9521be3b804a482e3a0ee..1d852cf57eeb11eb3640c84ff43f17a95e018f1e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,3 +27,4 @@ Matthew Palmer -- mysql enhancements
 romain.tartiere@healthgrid.org -- ldap fixes
 Adam Monsen - spec file updates
 Matthew Palmer <mpalmer@debian.org> -- halt loglevel feature
+dan@garthwaite.org -- reportspace bugfix

diff --git a/ChangeLog b/ChangeLog
index 195bbab287e059688567f2b7e756b232693bb735..ca0a95212f98a94b9013cb5258b3c534b67a0d33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+version 0.9.7 -- UNRELEASED
+    backupninja changes
+        . fix bug in reportspace, thanks Dan Garthwaite
+
 version 0.9.6 -- July 21, 2008
     backupninja changes
         . fix bug in cstream definition, thanks Jamie McClelland

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