diff --git a/AUTHORS b/AUTHORS index 8c1d1c8430c6c27102613a72bd210e53a68cde0c..2a7ff4625b9c332d70456433f88b8eb4b97e7632 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 7eb37d6ae7775c04214070f0e201fa13c9a24f68..972055fb8bbcbae7d579ab64c7187fdffd30c88b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +version 0.9.8.1 -- October 31, 2010 (boo!) + backupninja changes + . Do not error out when no job is configured. Thanks to Jordi Mallach + <jordi@debian.org> for the patch (Closes: #597684) + sys: + . Route around broken vgcfgbackup not able to handle multiple VG arguments + version 0.9.8 -- September 12, 2010 backupninja changes . Added GZIP_OPTS option, defaulting to --rsyncable, so that this diff --git a/configure.in b/configure.in index 59ccd10ca6ef90665b29ef84a5ed9a57afaf96ab..dd128c1eebc52f57ba36cf5ec1d6f226ae662551 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ # The maintainer mode is causing me grief with newest versions of autotools #AM_MAINTAINER_MODE -AC_INIT([backupninja],[0.9.8],[backupninja@lists.riseup.net]) +AC_INIT([backupninja],[0.9.8.1],[backupninja@lists.riseup.net]) AC_CONFIG_SRCDIR([src/backupninja.in]) AM_INIT_AUTOMAKE diff --git a/handlers/sys.in b/handlers/sys.in index a92663e23766b43c9ed26ecb4e62d21d46effc70..fcf3e31cb8c42f6f5719f653a1809662ae4aa331 100755 --- a/handlers/sys.in +++ b/handlers/sys.in @@ -649,8 +649,11 @@ function doLvmBackup () { debug "$VGS --options vg_name --noheadings | @SED@ 's/^[ ]*//' | @SED@ 's/[ ]*$//' | tr '\n' ' '" vgs=`$VGS --options vg_name --noheadings | @SED@ 's/^[ ]*//' | @SED@ 's/[ ]*$//' | tr '\n' ' '` debug "Let's try to backup LVM metadata for detected volume groups: $vgs" - debug "$VGCFGBACKUP --file \"${lvmdir}\"/\'%s\' $vgs" - output=`$VGCFGBACKUP --file "${lvmdir}"/'%s' $vgs` + for vg in $vgs + do + debug "$VGCFGBACKUP --file \"${lvmdir}\"/\'%s\' $vg" + output=`$VGCFGBACKUP --file "${lvmdir}"/'%s' $vg` + done exit_code=$? debug $output case $exit_code in diff --git a/src/backupninja.in b/src/backupninja.in index b397a142069ab5ca9f641f65800c9427a86d871a..789debdd01a09ab802c0362e8cfd2a4924b010e5 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