From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 4 Nov 2007 16:44:18 +0000 (+0000)
Subject: Commit verify-loop patch
X-Git-Tag: Release-3.0.0~2299
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=15d40b1a38b8aee81e2cdb7263c25c272b80a854;p=bacula%2Fbacula

Commit verify-loop patch

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5849 91ce42f0-d328-0410-95d8-f526ca767f89
---

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 <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;
+ }
+