From 3185d992da799732ce33035e01827b1a046d7c56 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 4 Nov 2007 11:10:30 +0000 Subject: [PATCH] kes This patch fixes bug #1003 where putting the message output from a Verify job into the catalog results in a recursive loop. The problem seems to show up only with postgresql (to be verified). git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5843 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/patches/2.2.5-verify-loop.patch | 33 ++++++++++++++++++++++++++ bacula/src/dird/verify.c | 4 ++-- bacula/src/version.h | 4 ++-- 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 bacula/patches/2.2.5-verify-loop.patch diff --git a/bacula/patches/2.2.5-verify-loop.patch b/bacula/patches/2.2.5-verify-loop.patch new file mode 100644 index 0000000000..9016cfe297 --- /dev/null +++ b/bacula/patches/2.2.5-verify-loop.patch @@ -0,0 +1,33 @@ + + This patch fixes bug #1003 where putting the message output from + a Verify job into the catalog results in a recursive loop. The problem + seems to show up only with postgresql (to be verified). + + Apply it to version 2.2.5 (or probably any previous 2.2.x version) with + + cd + ./configure not necessary if already configured + patch -p0 <2.2.5-verify-loop.patch + make + ... + make install + + +Index: src/dird/verify.c +=================================================================== +--- src/dird/verify.c (revision 5814) ++++ src/dird/verify.c (working copy) +@@ -767,11 +767,11 @@ + return 1; + } + if (!jcr->fn_printed) { +- Jmsg(jcr, M_INFO, 0, _("\nThe following files are in the Catalog but not on %s:\n"), ++ Qmsg(jcr, M_INFO, 0, _("\nThe following files are in the Catalog but not on %s:\n"), + jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG ? "the Volume(s)" : "disk"); + jcr->fn_printed = true; + } +- Jmsg(jcr, M_INFO, 0, " %s%s\n", row[0]?row[0]:"", row[1]?row[1]:""); ++ Qmsg(jcr, M_INFO, 0, " %s%s\n", row[0]?row[0]:"", row[1]?row[1]:""); + return 0; + } + diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c index 8562add9db..559eb0eaea 100644 --- a/bacula/src/dird/verify.c +++ b/bacula/src/dird/verify.c @@ -767,11 +767,11 @@ static int missing_handler(void *ctx, int num_fields, char **row) return 1; } if (!jcr->fn_printed) { - Jmsg(jcr, M_INFO, 0, _("\nThe following files are in the Catalog but not on %s:\n"), + Qmsg(jcr, M_INFO, 0, _("\nThe following files are in the Catalog but not on %s:\n"), jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG ? "the Volume(s)" : "disk"); jcr->fn_printed = true; } - Jmsg(jcr, M_INFO, 0, " %s%s\n", row[0]?row[0]:"", row[1]?row[1]:""); + Qmsg(jcr, M_INFO, 0, " %s%s\n", row[0]?row[0]:"", row[1]?row[1]:""); return 0; } diff --git a/bacula/src/version.h b/bacula/src/version.h index 817c807427..113970680e 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -4,8 +4,8 @@ #undef VERSION #define VERSION "2.2.6" -#define BDATE "02 November 2007" -#define LSMDATE "02Nov07" +#define BDATE "04 November 2007" +#define LSMDATE "04Nov07" #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n" #define BYEAR "2007" /* year for copyright messages in progs */ -- 2.39.5