From f49a612006cf9c0335674879ca39902d9a58d251 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 29 Oct 2010 10:30:43 -0400 Subject: Do not error out when no job is configured (Closes: #597684) Conflicts: ChangeLog --- AUTHORS | 1 + ChangeLog | 5 +++++ src/backupninja.in | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 8c1d1c8..2a7ff46 100644 --- a/AUTHORS +++ b/AUTHORS @@ -35,3 +35,4 @@ stefan -- dup support for Amazon S3 buckets maniacmartin -- rdiff confusing error message fix Chris Nolan -- maildir subdirectory expansion Dan Carley -- mysql bugfix +Jordi Mallach -- 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 + 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 -- cgit v1.2.3 From 5d4e52dfd1211ed3b71778635b7e0da26c00b583 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 1 Oct 2010 18:09:43 -0400 Subject: older versions (lenny) of lvm2 have a bug in vgcfgbackup that makes it so when you specify multiple volume groups to backup, it gives an error, saying you must set the %s template for the name. We are doing that, it just cannot handle it properly. This change routes around this issue, which has been fixed in later lvm2 releases, by passing only one argument to vgcfgbackup by taking all the volume groups that are found and running them through a for loop --- handlers/sys.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/handlers/sys.in b/handlers/sys.in index a92663e..fcf3e31 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 -- cgit v1.2.3 From 8629599e5d2701fb05c9642f82fcfe7f16fe1911 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 29 Oct 2010 10:42:14 -0400 Subject: add changelog entry for vgcfgbackup fix Conflicts: ChangeLog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index e28ee60..3268011 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ version 0.9.8.1 -- UNRELEASED backupninja changes . Do not error out when no job is configured. Thanks to Jordi Mallach 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 -- cgit v1.2.3 From ab92883a63860b626bfc2faafd54a1544e1b8583 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 31 Oct 2010 16:30:45 -0400 Subject: bump version numbers in preparation for release --- ChangeLog | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3268011..972055f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -version 0.9.8.1 -- UNRELEASED +version 0.9.8.1 -- October 31, 2010 (boo!) backupninja changes . Do not error out when no job is configured. Thanks to Jordi Mallach for the patch (Closes: #597684) diff --git a/configure.in b/configure.in index 59ccd10..dd128c1 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 -- cgit v1.2.3