Minor modifications outside DVD functions.

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

diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index d2fb896a7be8b8e034d1b07bdbd2b49ce5ec66e2..148a365165e0b5a169ffd2f021c7a15d66a35f91 100644 (file)
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -188,10 +188,10 @@ DCR *acquire_device_for_read(DCR *dcr)
        * If it is a tape, it checks the volume name
        */
       for ( ; !dev->is_open(); ) {
-         Dmsg1(120, "bstored: open vol=%s\n", dcr->VolumeName);
+         Dmsg1(100, "bstored: open vol=%s\n", dcr->VolumeName);
          if (dev->open(dcr, OPEN_READ_ONLY) < 0) {
             if (dev->dev_errno == EIO) {   /* no tape loaded */
-              Jmsg3(jcr, M_WARNING, 0, _("Open device %s Volume \"%s\" failed: ERR=%s\n"),
+              Jmsg3(jcr, M_WARNING, 0, _("Open device %s Volume \"%s\" failed (EIO): ERR=%s\n"),
                     dev->print_name(), dcr->VolumeName, strerror_dev(dev));
                goto default_path;
             }
@@ -199,15 +199,15 @@ DCR *acquire_device_for_read(DCR *dcr)
             /* If we have a dvd that requires mount, 
              * we need to try to open the label, so the info can be reported
              * if a wrong volume has been mounted. */
-            if (dev->is_dvd() && (dcr->VolCatInfo.VolCatParts > 0)) {
+/*            if (dev->is_dvd() && (dcr->VolCatInfo.VolCatParts > 0)) {
                break;
-            }
+            }*/
             
             Jmsg3(jcr, M_FATAL, 0, _("Open device %s Volume \"%s\" failed: ERR=%s\n"),
                 dev->print_name(), dcr->VolumeName, strerror_dev(dev));
             goto get_out;
          }
-         Dmsg1(129, "opened dev %s OK\n", dev->print_name());
+         Dmsg1(100, "opened dev %s OK\n", dev->print_name());
       }
       
       vol_label_status = read_dev_volume_label(dcr);

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index 109724ef497b2252af5400dfe34e858789a014bb..0d703058cf9752974a7a50bbd03113a2ebea38e7 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -184,9 +184,11 @@ static bool do_get_volume_info(DCR *dcr)
     memcpy(&dcr->VolCatInfo, &vol, sizeof(dcr->VolCatInfo));
 
    /* ***FIXME*** we really should not do this but must for the moment */
-   if (dcr->dev->num_parts < dcr->VolCatInfo.VolCatParts) {
+/*   if (dcr->dev->num_parts < dcr->VolCatInfo.VolCatParts) {
       dcr->dev->num_parts = dcr->VolCatInfo.VolCatParts;
    }
+   Now done in dev.c:open_dvd_device
+   */
 
     Dmsg2(300, "do_reqest_vol_info return true slot=%d Volume=%s\n",
           vol.Slot, vol.VolCatName);