From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 18 Aug 2008 20:53:20 +0000 (+0000)
Subject: kes  Add additional info to some SD messages.
X-Git-Tag: Release-3.0.0~1068
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e2bce4bb7d39d30932240ad77e85d2a5b0ff8475;p=bacula%2Fbacula

kes  Add additional info to some SD messages.
kes  Add fix supplied by Martin Simmons for turning off EOL character
     in new console multi-command code.

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

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 0efadb8fe5..56d7a4ca76 100644
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -353,12 +353,11 @@ static int eolcmd(FILE *input, BSOCK *UA_sock)
 {
    if ((argc > 1) && (strchr("!$%&'()*+,-/:;<>?[]^`{|}~", argk[1][0]) != NULL)) {
       eol = argk[1][0];
-      return 1;
    } else if (argc == 1) {
       eol = '\0';
+   } else {
+      sendit(_("Illegal separator character.\n"));
    }
-
-   sendit(_("Illegal separator character.\n"));
    return 1;
 }
 
diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index 2aba368092..5345ca35eb 100644
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -111,10 +111,10 @@ bool acquire_device_for_read(DCR *dcr)
       DIRSTORE *store;
       int stat;
 
-      Jmsg3(jcr, M_INFO, 0, _("Changing device. Want Media Type=\"%s\" have=\"%s\"\n"
+      Jmsg3(jcr, M_INFO, 0, _("Changing read device. Want Media Type=\"%s\" have=\"%s\"\n"
                               "  device=%s\n"), 
             dcr->media_type, dev->device->media_type, dev->print_name());
-      Dmsg3(50, "Changing device. Want Media Type=\"%s\" have=\"%s\"\n"
+      Dmsg3(50, "Changing read device. Want Media Type=\"%s\" have=\"%s\"\n"
                               "  device=%s\n", 
             dcr->media_type, dev->device->media_type, dev->print_name());
 
@@ -147,9 +147,9 @@ bool acquire_device_for_read(DCR *dcr)
          dev = dcr->dev;                     /* get new device pointer */
          dev->dblock(BST_DOING_ACQUIRE); 
          dcr->VolumeName[0] = 0;
-         Jmsg(jcr, M_INFO, 0, _("Media Type change.  New device %s chosen.\n"),
+         Jmsg(jcr, M_INFO, 0, _("Media Type change.  New read device %s chosen.\n"),
             dev->print_name());
-         Dmsg1(50, "Media Type change.  New device %s chosen.\n", dev->print_name());
+         Dmsg1(50, "Media Type change.  New read device %s chosen.\n", dev->print_name());
 
          bstrncpy(dcr->VolumeName, vol->VolumeName, sizeof(dcr->VolumeName));
          bstrncpy(dcr->VolCatInfo.VolCatName, vol->VolumeName, sizeof(dcr->VolCatInfo.VolCatName));
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index d4e6b39234..f65aefbd12 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -32,6 +32,10 @@ separator in console (!$%&'()*+,-/:;<>?[]^`{|}~)
 
 
 General:
+18Aug08
+kes  Add additional info to some SD messages.
+kes  Add fix supplied by Martin Simmons for turning off EOL character
+     in new console multi-command code.
 14Aug08
 kes  Fix a Verify InitCatalog problem where in certain cases
      a garbage filename may be entered in the verification database.  This