From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 20 Sep 2007 08:30:56 +0000 (+0000)
Subject: 0Sep07
X-Git-Tag: Release-2.2.5~31
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=366baaaa55ecee18ae720eb1377e3b5ca990901d;p=bacula%2Fbacula

0Sep07
kes  Apply 2.2.4-poll-mount fix, that resolves bug #908 where a tape
     is not properly mounted (recognized) during a poll.
kes  Apply 2.2.4-verify patch that resolves bug #958.  A Verify catalog
     Job that has differences reports Verify OK.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5603 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/patches/2.2.4-verify.patch b/bacula/patches/2.2.4-verify.patch
new file mode 100644
index 0000000000..21e9af3442
--- /dev/null
+++ b/bacula/patches/2.2.4-verify.patch
@@ -0,0 +1,75 @@
+ This patch fixes bug #958 A Verify catalog Job that has differences reports Verify OK.
+
+ Apply it to version 2.2.4 (possibly earlier versions with):
+
+ cd <bacula-source>
+ patch -p0 <2.2.4-verify.patch
+ ./configure (your options)
+ make
+ ...
+ make install
+
+Index: src/dird/verify.c
+===================================================================
+--- src/dird/verify.c	(revision 5553)
++++ src/dird/verify.c	(working copy)
+@@ -332,13 +332,10 @@
+    }
+ 
+    stat = wait_for_job_termination(jcr);
+-   if (stat == JS_Terminated) {
+-      verify_cleanup(jcr, stat);
+-      return true;
+-   }
++   verify_cleanup(jcr, stat);
++   return true;
+ 
+ bail_out:
+-   verify_cleanup(jcr, JS_ErrorTerminated);
+    return false;
+ }
+ 
+@@ -421,7 +418,7 @@
+    jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg));
+    if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) {
+       jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg));
+-   Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
++      Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
+ "  Build OS:               %s %s %s\n"
+ "  JobId:                  %d\n"
+ "  Job:                    %s\n"
+@@ -456,7 +453,7 @@
+          sd_term_msg,
+          term_msg);
+    } else {
+-   Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
++      Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
+ "  Build:                  %s %s %s\n"
+ "  JobId:                  %d\n"
+ "  Job:                    %s\n"
+@@ -750,7 +747,9 @@
+       stat = JS_Differences;
+    }
+    free_pool_memory(fname);
+-   set_jcr_job_status(jcr, stat);
++   if (!job_canceled(jcr)) {
++      jcr->JobStatus = stat;
++   }
+    return stat == JS_Terminated;
+ }
+ 
+Index: src/lib/jcr.c
+===================================================================
+--- src/lib/jcr.c	(revision 5553)
++++ src/lib/jcr.c	(working copy)
+@@ -614,9 +614,8 @@
+          /* Override more minor status */
+          jcr->JobStatus = JobStatus;
+          break;
+-      default:
+-         break;
+       }
++      break;
+    default:
+       jcr->JobStatus = JobStatus;
+    }
diff --git a/bacula/src/version.h b/bacula/src/version.h
index e71fe90eeb..2245860828 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.2.4"
-#define BDATE   "14 September 2007"
-#define LSMDATE "14Sep07"
+#define VERSION "2.2.5"
+#define BDATE   "20 September 2007"
+#define LSMDATE "20Sep07"
 
 #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 ae1d6828ca..f2e110df42 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -2,8 +2,10 @@
 
 General:
 20Sep07
-kes  Apply 2.2.4-poll-mount fix, that resolves bug ##908 where a tape 
+kes  Apply 2.2.4-poll-mount fix, that resolves bug #908 where a tape 
      is not properly mounted (recognized) during a poll.
+kes  Apply 2.2.4-verify patch that resolves bug #958.  A Verify catalog 
+     Job that has differences reports Verify OK.
 
 Release Version 2.2.4
 14Sep07