From 0a7a2c6e47fdc7cb9a3e2a8e3918aace8e1b035f Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 28 May 2004 19:17:21 +0000 Subject: [PATCH] Fix minor update slots bugs git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1371 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/stored/autochanger.c | 2 +- bacula/src/stored/dircmd.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c index 5eb229500e..60f428a2ce 100644 --- a/bacula/src/stored/autochanger.c +++ b/bacula/src/stored/autochanger.c @@ -85,7 +85,7 @@ int autoload_device(JCR *jcr, DEVICE *dev, int writing, BSOCK *dir) offline_or_rewind_dev(dev); /* We are going to load a new tape, so close the device */ force_close_dev(dev); - if (loaded != 0) { /* must unload drive */ + if (loaded != 0 && loaded != -1) { /* must unload drive */ Dmsg0(400, "Doing changer unload.\n"); Jmsg(jcr, M_INFO, 0, _("3303 Issuing autochanger \"unload slot %d, drive %d\" command.\n"), diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c index 43569da2b7..574e9d89ec 100644 --- a/bacula/src/stored/dircmd.c +++ b/bacula/src/stored/dircmd.c @@ -852,7 +852,8 @@ static void read_volume_label(JCR *jcr, DEVICE *dev, int Slot) dev->state &= ~ST_LABEL; /* force read of label */ switch (read_dev_volume_label(jcr, dev, block)) { case VOL_OK: - bnet_fsend(dir, _("3001 Volume=\"%s\" Slot=%d\n"), dev->VolHdr.VolName, Slot); + /* DO NOT add quotes around the Volume name. It is scanned in the DIR */ + bnet_fsend(dir, _("3001 Volume=%s Slot=%d\n"), dev->VolHdr.VolName, Slot); Dmsg1(100, "Volume: %s\n", dev->VolHdr.VolName); break; default: -- 2.39.2