1 This patch fixes bug #958 A Verify catalog Job that has differences reports Verify OK.
3 Apply it to version 2.2.4 (possibly earlier versions with):
6 patch -p0 <2.2.4-verify.patch
7 ./configure (your options)
12 Index: src/dird/verify.c
13 ===================================================================
14 --- src/dird/verify.c (revision 5553)
15 +++ src/dird/verify.c (working copy)
19 stat = wait_for_job_termination(jcr);
20 - if (stat == JS_Terminated) {
21 - verify_cleanup(jcr, stat);
24 + verify_cleanup(jcr, stat);
28 - verify_cleanup(jcr, JS_ErrorTerminated);
33 jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg));
34 if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) {
35 jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg));
36 - Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
37 + Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
38 " Build OS: %s %s %s\n"
45 - Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
46 + Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
51 stat = JS_Differences;
53 free_pool_memory(fname);
54 - set_jcr_job_status(jcr, stat);
55 + if (!job_canceled(jcr)) {
56 + jcr->JobStatus = stat;
58 return stat == JS_Terminated;
62 ===================================================================
63 --- src/lib/jcr.c (revision 5553)
64 +++ src/lib/jcr.c (working copy)
66 /* Override more minor status */
67 jcr->JobStatus = JobStatus;
74 jcr->JobStatus = JobStatus;