aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-09-22 20:47:34 +0200
committerintrigeri <intrigeri@boum.org>2010-09-22 20:47:34 +0200
commitd598a50cb9b55edd073a03b2ae6a5ba28a117551 (patch)
tree0d6a94e7d2f23cab64d61f6222c23dc265dcb3e4
parentc0c02efafd0eb34355aa72e2f14f22ccd81018e9 (diff)
downloadbackupninja-d598a50cb9b55edd073a03b2ae6a5ba28a117551.tar.gz
backupninja-d598a50cb9b55edd073a03b2ae6a5ba28a117551.tar.bz2
Do not error out when no job is configured (Closes: #597684)
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog3
-rwxr-xr-xsrc/backupninja.in2
3 files changed, 5 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index cec8819..070b885 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 \ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 792841e..c5f7dce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
version 0.9.9 -- UNRELEASED
+ backupninja changes
+ . Do not error out when no job is configured. Thanks to Jordi Mallach
+ <jordi@debian.org> for the patch (Closes: #597684)
handler changes
rdiff:
. Support reading include/exclude patterns from files using the
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