From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 4 Nov 2007 11:06:53 +0000 (+0000)
Subject: Undo change in r5841 as log comment was wrong
X-Git-Tag: Release-2.2.6~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1337d9a1a75cc8f36eb8716b0daa1882e37d610a;p=bacula%2Fbacula

Undo change in r5841 as log comment was wrong

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5842 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
deleted file mode 100644
index 9016cfe297..0000000000
--- a/bacula/patches/2.2.5-verify-loop.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-
- 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;
- }
- 
diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index 559eb0eaea..8562add9db 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) {
-      Qmsg(jcr, M_INFO, 0, _("\nThe following files are in the Catalog but not on %s:\n"),
+      Jmsg(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;
    }
-   Qmsg(jcr, M_INFO, 0, "      %s%s\n", row[0]?row[0]:"", row[1]?row[1]:"");
+   Jmsg(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 113970680e..817c807427 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.2.6"
-#define BDATE   "04 November 2007"
-#define LSMDATE "04Nov07"
+#define BDATE   "02 November 2007"
+#define LSMDATE "02Nov07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 139f6b1896..524e2a1dba 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,10 @@
               Technical notes on version 2.2
 
 General:
+04Nov07
+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).
 02Nov07
 kes  Fix bug #942 where lots of emails where generated when the heartbeat
      interval was low and Bacula wanted a different tape from the one in