Suppress extra error messages during batch insert failure.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5656 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/catreq.c b/bacula/src/dird/catreq.c
index 8609039e17bd9df8512e59aa64bc92f845410aaf..cc1903615f8ea585503b65f9d0e8d53060a7150b 100644 (file)
--- a/bacula/src/dird/catreq.c
+++ b/bacula/src/dird/catreq.c
@@ -358,7 +358,7 @@ void catalog_update(JCR *jcr, BSOCK *bs)
    POOLMEM *omsg;
 
    Dsm_check(1);
-   if (!jcr->pool->catalog_files) {
+   if (job_canceled(jcr) || !jcr->pool->catalog_files) {
       goto bail_out;                  /* user disabled cataloging */
    }
    if (!jcr->db) {

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 812dc78379c1e266bc6b4b56b16025e7b6f37f77..2cf9febc6de85447ad89bc32c903f285ea495fb8 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -2,6 +2,7 @@
 
 General:
 26Sep07
+kes  Suppress extra error messages during batch insert failure.
 kes  Add jcr to timer packets so if killed message can be sent to job.
 kes  Add JobId to all Dmsg() output.
 kes  Put some FD auth code on dbglvl rather than fixed.