Update VolParts when writing the last part (no more free space).

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

diff --git a/bacula/nb-1.37 b/bacula/nb-1.37
index f4c0aa441b5e79520411025e5c61c3afdc8baf1a..b9bcce64f8e8b3cd4630cb6da829c8c6d2ce34e9 100644 (file)
--- a/bacula/nb-1.37
+++ b/bacula/nb-1.37
@@ -4,6 +4,8 @@
 General:
 
 Changes to 1.37.*:
+26Oct05
+ - dvd.c: update VolParts when writing the last part.
 19Oct05
  - configure: add check for dd, remove check for df
  - block.c:do_dvd_size_checks: Check we are writing to a dvd before doing tests

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index 87c67abe84b8844b48eb618b88424c8a6515e3b1..5f3f2feb0442342f7ef6136d956b013efe2bd4bd 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -696,6 +696,7 @@ static bool terminate_writing_volume(DCR *dcr)
    
    if (dev->is_dvd()) {
       dvd_write_part(dcr);                 /* write last part */
+      dev->VolCatInfo.VolCatParts = dev->num_parts;
    }
    
    if (!dir_update_volume_info(dcr, false)) {

diff --git a/bacula/src/stored/dvd.c b/bacula/src/stored/dvd.c
index 578cbaaaf8b664a03f22862d9ad202719638a0b9..417cf5fcec0fad34143699161341700c004b17d1 100644 (file)
--- a/bacula/src/stored/dvd.c
+++ b/bacula/src/stored/dvd.c
@@ -488,6 +488,8 @@ int dvd_open_next_part(DCR *dcr)
     *  needed. If num_parts represents what is on the DVD
     *  we should only need to change it when writing a part
     *  to the DVD.
+    * NB. As dvd_write_part increments dev->num_parts, I also
+    *  think it is not needed.
     */
    if (dev->num_parts < dev->part) {
       Dmsg2(100, "Set npart=%d to part=%d\n", dev->num_parts, dev->part);