Additional message plus exclusion fix

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

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 88ad1569dfe336863f66ba050dcfb3ff5c0bb0dd..c696ba285b4bd0b88a2fed9233962512e5d4f34a 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -318,19 +318,12 @@ static int include_cmd(JCR *jcr)
 static int exclude_cmd(JCR *jcr)
 {
    BSOCK *dir = jcr->dir_bsock;
-   char *p;  
 
    while (bnet_recv(dir) >= 0) {
        dir->msg[dir->msglen] = 0;
        strip_trailing_junk(dir->msg);
-       /* Skip leading options */
-       for (p=dir->msg; *p && *p != ' '; p++)
-         { }
-       /* Skip spaces */
-       for ( ; *p && *p == ' '; p++)
-         { }
-       add_fname_to_exclude_list((FF_PKT *)jcr->ff, p);
-       Dmsg1(110, "<dird: exclude file %s\n", dir->msg);
+       add_fname_to_exclude_list((FF_PKT *)jcr->ff, dir->msg);
+       Dmsg1(110, "<dird: exclude file :%s:\n", dir->msg);
    }
 
    return bnet_fsend(dir, OKexc);

diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c
index 92182bd9cb6d0ed8ef033360d511bb4aef3874d1..6d8dbf71b92535da6e62b64c08c5a49de92236db 100644 (file)
--- a/bacula/src/stored/dircmd.c
+++ b/bacula/src/stored/dircmd.c
@@ -468,7 +468,8 @@ static int mount_cmd(JCR *jcr)
                   bnet_fsend(dir, _("3001 Device %s is mounted with Volume %s\n"), 
                     dev->dev_name, dev->VolHdr.VolName);
               } else {
-                  bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"), 
+                  bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"
+                                    "Try unmounting and remounting the Volume.\n"),
                             dev->dev_name);
               }
               break;
@@ -488,7 +489,8 @@ static int mount_cmd(JCR *jcr)
                      bnet_fsend(dir, _("3001 Device %s is mounted with Volume %s\n"),
                        dev->dev_name, dev->VolHdr.VolName);
                  } else {
-                     bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"), 
+                     bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"   
+                                    "Try unmounting and remounting the Volume.\n"),
                                dev->dev_name);
                  }
               } else {
@@ -506,7 +508,8 @@ static int mount_cmd(JCR *jcr)
                      bnet_fsend(dir, _("3001 Device %s is mounted with Volume %s\n"), 
                        dev->dev_name, dev->VolHdr.VolName);
                  } else {
-                     bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"), 
+                     bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"
+                                       "Try unmounting and remounting the Volume.\n"),
                                dev->dev_name);
                  }
               }