aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2010-10-29 10:30:43 -0400
committerMicah Anderson <micah@riseup.net>2010-10-29 10:30:43 -0400
commitf49a612006cf9c0335674879ca39902d9a58d251 (patch)
treea36253bcda4278646d2adac519efe895d37e6bd1
parent34e439ea7bd26f1cbe6741c19319a3d9182356ea (diff)
downloadbackupninja-f49a612006cf9c0335674879ca39902d9a58d251.tar.gz
backupninja-f49a612006cf9c0335674879ca39902d9a58d251.tar.bz2
Do not error out when no job is configured (Closes: #597684)
Conflicts: ChangeLog
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog5
-rwxr-xr-xsrc/backupninja.in2
3 files changed, 7 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 8c1d1c8..2a7ff46 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,3 +35,4 @@ stefan <s.freudenberg@jpberlin.de> -- dup support for Amazon S3 buckets
maniacmartin <martin@maniacmartin.com> -- rdiff confusing error message fix
Chris Nolan <chris@cenolan.com> -- maildir subdirectory expansion
Dan Carley -- mysql bugfix
+Jordi Mallach <jordi@debian.org> -- do not error when no jobs are configured
diff --git a/ChangeLog b/ChangeLog
index 7eb37d6..e28ee60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+version 0.9.8.1 -- UNRELEASED
+ backupninja changes
+ . Do not error out when no job is configured. Thanks to Jordi Mallach
+ <jordi@debian.org> for the patch (Closes: #597684)
+
version 0.9.8 -- September 12, 2010
backupninja changes
. Added GZIP_OPTS option, defaulting to --rsyncable, so that this
diff --git a/src/backupninja.in b/src/backupninja.in
index b397a14..789debd 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -519,7 +519,7 @@ else
files=`find $configdirectory -follow -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`
if [ -z "$files" ]; then
- fatal "No backup actions configured in '$configdirectory', run ninjahelper!"
+ info "No backup actions configured in '$configdirectory', run ninjahelper!"
fi
fi