Fix bug #1307 AllowHigherDuplicates=no prevents automatic job escalation

[bacula/bacula] / bacula / src / dird / verify.c

diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index 3f1e57b52113a656817c3aeb8a031a05003b59a0..7694bd44d7b5a43b5646f4391752b0a8fcd0244f 100644 (file)
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -162,7 +162,8 @@ bool do_verify(JCR *jcr)
               db_strerror(jcr->db));
          return false;
       }
-      if (jcr->previous_jr.JobStatus != 'T') {
+      if (!(jcr->previous_jr.JobStatus == JS_Terminated ||
+            jcr->previous_jr.JobStatus == JS_Warnings)) {
          Jmsg(jcr, M_FATAL, 0, _("Last Job %d did not terminate normally. JobStatus=%c\n"),
             verify_jobid, jcr->previous_jr.JobStatus);
          return false;
@@ -462,7 +463,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
            edt,
            edit_uint64_with_commas(jcr->ExpectedFiles, ec1),
            edit_uint64_with_commas(jcr->JobFiles, ec2),
-           jcr->Errors,
+           jcr->JobErrors,
            fd_term_msg,
            sd_term_msg,
            term_msg);
@@ -494,7 +495,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
            sdt,
            edt,
            edit_uint64_with_commas(jcr->JobFiles, ec1),
-           jcr->Errors,
+           jcr->JobErrors,
            fd_term_msg,
            term_msg);
    }