From ade10892d318439e1e4b723827e3db0f97f2f683 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 11 Oct 2005 20:40:52 +0000
Subject: [PATCH] - Add extra debug to Update media error for VolFiles decrease
   error. - Do not update dev->file on set_ateof() for non-tape.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2432 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/kes-1.37            | 4 ++++
 bacula/src/dird/catreq.c   | 2 +-
 bacula/src/stored/askdir.c | 2 +-
 bacula/src/stored/dev.c    | 4 +++-
 bacula/src/version.h       | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 15d2447900..f3ec1cbc2b 100644
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,6 +4,10 @@
 General:
 
 Changes to 1.37.41:
+11Oct05
+- Add extra debug to Update media error for VolFiles decrease
+  error.
+- Do not update dev->file on set_ateof() for non-tape.
 10Oct05
 - Mark DVD volume in error if part cannot be written.
 - If a DVD is mounted, unmount it before asking operator
diff --git a/bacula/src/dird/catreq.c b/bacula/src/dird/catreq.c
index 809d5a529a..93d1e3143b 100644
--- a/bacula/src/dird/catreq.c
+++ b/bacula/src/dird/catreq.c
@@ -236,7 +236,7 @@ void catalog_request(JCR *jcr, BSOCK *bs)
                  " for Volume \"%s\". This is incorrect.\n"),
                mr.VolFiles, sdmr.VolFiles, mr.VolumeName);
             bnet_fsend(bs, _("1992 Update Media error. VolFiles=%u, CatFiles=%u\n"),
-               sdmr.VolFiles, mr.VolViles);
+               sdmr.VolFiles, mr.VolFiles);
             db_unlock(jcr->db);
             return;
          }
diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index c5545b62d1..08176ce3a9 100644
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -291,7 +291,7 @@ bool dir_update_volume_info(DCR *dcr, bool label)
       return false;
    }
 
-   Dmsg1(300, "Update cat VolFiles=%d\n", dev->file);
+   Dmsg1(100, "Update cat VolFiles=%d\n", dev->file);
    /* Just labeled or relabeled the tape */
    if (label) {
       bstrncpy(vol->VolCatStatus, "Append", sizeof(vol->VolCatStatus));
diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index 0cd3fcfa06..14c3d39355 100644
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -745,7 +745,9 @@ const char *DEVICE::print_blocked() const
 void DEVICE::set_ateof() 
 { 
    set_eof();
-   file++;
+   if (is_tape()) {
+      file++;
+   }
    file_addr = 0;
    file_size = 0;
    block_num = 0;
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 726541a078..ab50b34c8b 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.37.41"
-#define BDATE   "10 October 2005"
-#define LSMDATE "10Oct05"
+#define BDATE   "11 October 2005"
+#define LSMDATE "11Oct05"
 
 /* Debug flags */
 #undef  DEBUG
-- 
2.39.5