Fix broken editing code

[bacula/bacula] / bacula / src / stored / append.c

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 8fddd1fe05c94a46387da5981e2bfcb6d0f65090..be75d4f367a0bb773d701af53c4d1746bd5eb3b0 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -239,9 +239,11 @@ bool do_append_data(JCR *jcr)
       Dmsg1(650, "End read loop with FD. Stat=%d\n", n);
 
       if (ds->is_error()) {
-         Dmsg1(350, "Network read error from FD. ERR=%s\n", ds->bstrerror());
-         Jmsg1(jcr, M_FATAL, 0, _("Network error on data channel. ERR=%s\n"),
-               ds->bstrerror());
+         if (!job_canceled(jcr)) {
+            Dmsg1(350, "Network read error from FD. ERR=%s\n", ds->bstrerror());
+            Jmsg1(jcr, M_FATAL, 0, _("Network error on data channel. ERR=%s\n"),
+                  ds->bstrerror());
+         }
          ok = false;
          break;
       }
@@ -289,9 +291,11 @@ bool do_append_data(JCR *jcr)
       Dmsg0(90, "back from write_end_session_label()\n");
       /* Flush out final partial block of this session */
       if (!write_block_to_device(dcr)) {
-         Jmsg2(jcr, M_FATAL, 0, _("Fatal append error on device %s: ERR=%s\n"),
-               dev->print_name(), dev->bstrerror());
-         Dmsg0(100, _("Set ok=FALSE after write_block_to_device.\n"));
+         if (!job_canceled(jcr)) {
+            Jmsg2(jcr, M_FATAL, 0, _("Fatal append error on device %s: ERR=%s\n"),
+                  dev->print_name(), dev->bstrerror());
+            Dmsg0(100, _("Set ok=FALSE after write_block_to_device.\n"));
+         }
          ok = false;
       }
       if (dev->VolCatInfo.VolCatName[0] == 0) {