From: <ke...@us...> - 2007-11-04 11:10:27
|
Revision: 5843 http://bacula.svn.sourceforge.net/bacula/?rev=5843&view=rev Author: kerns Date: 2007-11-04 03:10:30 -0800 (Sun, 04 Nov 2007) Log Message: ----------- 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). Modified Paths: -------------- branches/Branch-2.2/bacula/src/dird/verify.c branches/Branch-2.2/bacula/src/version.h Added Paths: ----------- branches/Branch-2.2/bacula/patches/2.2.5-verify-loop.patch Added: branches/Branch-2.2/bacula/patches/2.2.5-verify-loop.patch =================================================================== --- branches/Branch-2.2/bacula/patches/2.2.5-verify-loop.patch (rev 0) +++ branches/Branch-2.2/bacula/patches/2.2.5-verify-loop.patch 2007-11-04 11:10:30 UTC (rev 5843) @@ -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 <bacula-source> + ./configure <your-options> 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; + } + Modified: branches/Branch-2.2/bacula/src/dird/verify.c =================================================================== --- branches/Branch-2.2/bacula/src/dird/verify.c 2007-11-04 11:06:53 UTC (rev 5842) +++ branches/Branch-2.2/bacula/src/dird/verify.c 2007-11-04 11:10:30 UTC (rev 5843) @@ -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; } Modified: branches/Branch-2.2/bacula/src/version.h =================================================================== --- branches/Branch-2.2/bacula/src/version.h 2007-11-04 11:06:53 UTC (rev 5842) +++ branches/Branch-2.2/bacula/src/version.h 2007-11-04 11:10:30 UTC (rev 5843) @@ -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 */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |