Update technotes

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

diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index 63cecc57f1d496ccffaae3098bf92b1fe05631a1..71dc8b48ef02fc1f447fbf233865c6d0060bcbab 100644 (file)
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -332,13 +332,10 @@ bool do_verify(JCR *jcr)
    }
 
    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 @@ void verify_cleanup(JCR *jcr, int TermCode)
    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 @@ void verify_cleanup(JCR *jcr, int TermCode)
          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 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId)
       stat = JS_Differences;
    }
    free_pool_memory(fname);
-   set_jcr_job_status(jcr, stat);
+   if (!job_canceled(jcr)) {
+      jcr->JobStatus = stat;
+   }
    return stat == JS_Terminated;
 }
 

diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index 0b5e01fdc84f372f581c3b1b53c1b9a58b9b0f12..882bf9c07f82b9ab8fa284d6ffa5e6c60fd76b1a 100644 (file)
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -614,9 +614,8 @@ void set_jcr_job_status(JCR *jcr, int JobStatus)
          /* Override more minor status */
          jcr->JobStatus = JobStatus;
          break;
-      default:
-         break;
       }
+      break;
    default:
       jcr->JobStatus = JobStatus;
    }

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index d1a49e294c56357475efb91b1c5cd57c0bff1c84..ae1d6828ca4ce64c5e9796fc4b8d96694c4725da 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -4,6 +4,7 @@ General:
 20Sep07
 kes  Apply 2.2.4-poll-mount fix, that resolves bug ##908 where a tape 
      is not properly mounted (recognized) during a poll.
+
 Release Version 2.2.4
 14Sep07
 kes  Increase size of name string when FD making connection to SD.