- Add VolumePurged method to Python JobEvents class. Fixes

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

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 3c5cd66e61af1fca63eb3a590efd69681c95ce50..8427f7e141dd6d8c9503b26f299e498055cf0cc5 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -8,19 +8,14 @@
    Copyright (C) 2000-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -49,7 +44,7 @@ bool do_append_data(JCR *jcr)
    DEVICE *dev = dcr->dev;
 
 
-   Dmsg0(10, "Start append data.\n");
+   Dmsg0(100, "Start append data.\n");
 
    memset(&rec, 0, sizeof(rec));
 
@@ -70,7 +65,7 @@ bool do_append_data(JCR *jcr)
    dir_send_job_status(jcr);
 
    if (dev->VolCatInfo.VolCatName[0] == 0) {
-      Pmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
+      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
    }
    Dmsg1(20, "Begin append device=%s\n", dev->print_name());
 
@@ -79,7 +74,7 @@ bool do_append_data(JCR *jcr)
 
    Dmsg0(100, "Just after acquire_device_for_append\n");
    if (dev->VolCatInfo.VolCatName[0] == 0) {
-      Pmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
+      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
    }
    /*
     * Write Begin Session Record
@@ -91,7 +86,7 @@ bool do_append_data(JCR *jcr)
       ok = false;
    }
    if (dev->VolCatInfo.VolCatName[0] == 0) {
-      Pmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
+      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
    }
 
    /* Tell File daemon to send data */
@@ -229,9 +224,9 @@ bool do_append_data(JCR *jcr)
                jcr->dir_bsock->spool = false;
             }
          }
-         Dmsg0(350, "Enter bnet_get\n");
+         Dmsg0(650, "Enter bnet_get\n");
       }
-      Dmsg1(350, "End read loop with FD. Stat=%d\n", n);
+      Dmsg1(650, "End read loop with FD. Stat=%d\n", n);
       if (is_bnet_error(ds)) {
          Dmsg1(350, "Network read error from FD. ERR=%s\n", bnet_strerror(ds));
          Jmsg1(jcr, M_FATAL, 0, _("Network error on data channel. ERR=%s\n"),
@@ -245,8 +240,8 @@ bool do_append_data(JCR *jcr)
    set_jcr_job_status(jcr, ok?JS_Terminated:JS_ErrorTerminated);
 
    Dmsg1(200, "Write session label JobStatus=%d\n", jcr->JobStatus);
-   if (dev->VolCatInfo.VolCatName[0] == 0) {
-      Pmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
+   if ((!ok || job_canceled(jcr)) && dev->VolCatInfo.VolCatName[0] == 0) {
+      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
    }
 
    /*
@@ -261,7 +256,7 @@ bool do_append_data(JCR *jcr)
          ok = false;
       }
       if (dev->VolCatInfo.VolCatName[0] == 0) {
-         Pmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
+         Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
       }
       Dmsg0(90, "back from write_end_session_label()\n");
       /* Flush out final partial block of this session */
@@ -273,7 +268,7 @@ bool do_append_data(JCR *jcr)
       }
    }
    if (dev->VolCatInfo.VolCatName[0] == 0) {
-      Pmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
+      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
    }
 
    if (!ok) {