kes Fix logic error in handling error return from mtx-changer

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

diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index eeef37547c9dc25ab71b360919fb60e2a2810a40..9ca1a1f4ea016c43be800ff3f7e14af18ee39c4e 100644 (file)
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -109,8 +109,14 @@ bool read_records(DCR *dcr,
 
          } else if (dev->at_eof()) {
             if (verbose) {
-               Jmsg(jcr, M_INFO, 0, _("End of file %u  on device %s, Volume \"%s\"\n"),
-                  dev->file, dev->print_name(), dcr->VolumeName);
+               char dvdpart[100];
+               if (dev->is_dvd()) {
+                  bsnprintf(dvdpart, sizeof(dvdpart), _("part %d "), dev->part);
+               } else {
+                  dvdpart[0] = 0;
+               }
+               Jmsg(jcr, M_INFO, 0, _("End of file %u %son device %s, Volume \"%s\"\n"),
+                  dev->file, dvdpart, dev->print_name(), dcr->VolumeName);
             }
             Dmsg3(200, "End of file %u  on device %s, Volume \"%s\"\n",
                   dev->file, dev->print_name(), dcr->VolumeName);
@@ -246,6 +252,9 @@ bool read_records(DCR *dcr,
                rec->VolSessionId, rec->VolSessionTime, rec->FileIndex);
             break;                    /* read second part of record */
          }
+         Dmsg6(dbglvl, "OK callback. recno=%d state=%s blk=%d SI=%d ST=%d FI=%d\n", record,
+               rec_state_to_str(rec), block->BlockNumber,
+               rec->VolSessionId, rec->VolSessionTime, rec->FileIndex);
          ok = record_cb(dcr, rec);
          /*
           * If we have a digest stream, we check to see if we have