From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 9 Nov 2018 14:07:52 +0000 (+0100)
Subject: worm: Fix multiple display of the WORM Recycle message
X-Git-Tag: Release-9.4.0~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b36d32a5b2d7f68fffcce517e693095a7fe772b;p=thirdparty%2Fbacula.git

worm: Fix multiple display of the WORM Recycle message
---

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index 81b142ff1..a87ea2d82 100644
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -464,7 +464,7 @@ bool dir_update_volume_info(DCR *dcr, bool label, bool update_LastWritten,
 // }
    /* worm cannot be recycled, ensure catalog correct */
    if (dev->is_worm() && vol.VolRecycle) {
-      Jmsg(jcr, M_INFO, 0, _("WORM cassette detected: setting Recycle=No on Volume=\"%s\"\n"));
+      Jmsg(jcr, M_INFO, 0, _("WORM cassette detected: setting Recycle=No on Volume=\"%s\"\n"), vol.VolCatName);
       vol.VolRecycle = false;
    }
    pm_strcpy(VolumeName, vol.VolCatName);
@@ -537,6 +537,8 @@ bool dir_update_volume_info(DCR *dcr, bool label, bool update_LastWritten,
          dev->VolCatInfo.VolCatRecycles = dcr->VolCatInfo.VolCatRecycles;
          dev->VolCatInfo.VolCatWrites = dcr->VolCatInfo.VolCatWrites;
          dev->VolCatInfo.VolCatReads = dcr->VolCatInfo.VolCatReads;
+         dev->VolCatInfo.VolRecycle = dcr->VolCatInfo.VolRecycle;
+         dev->VolCatInfo.BytesWritten = 0;
       }
       ok = true;
    }