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 (file)
index 9016cfe..0000000
--- 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 559eb0eaeab7e9f02a700eeb3ff74d9fb4b6d8ba..8562add9dbac565703d48c362e3699f8f9042c2d 100644 (file)
--- 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 113970680e3e8e35ea4b38533d02329de73ca996..817c8074272382109997da0e245c90829f76d91c 100644 (file)
--- 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 139f6b189603014bd2cf7c18632406bcd7ef8f88..524e2a1dba6c8ce7c6177a97595869d5ed44fff6 100644 (file)
--- 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