Error msgs + doc

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 8b4560672975865b4ced3016995e489a92774d19..5d1b7a82f11248b0c317fdbdbe7ade06ef2feb00 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,6 +1,12 @@
 
 2003-10-24 Version 1.32c 24Oct03 Beta
 24Oct03
+- Eliminate ua_retention.c that was not used.
+- Improve error message when closing brace missing in conf file.
+- More doc updates.
+- Eliminate Don't forget to mount if it is a disk file.
+- Fix Gnome2 scrolling and blank screen problems.
+- Eliminate multiple JobIds in restore selection list.
 - Fix non-portable varargs code in var.c
 - Make doc fixes/changes suggested by Dan Languille
 23Oct03

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 3f7c81875adde78ad3d46003eae92b4e4fd15633..2980b8530b3863a960ef66234b469d1c77042ec8 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,20 +1,16 @@
 
           Release Notes for Bacula 1.32c
 
-  Bacula code: Total files = 259 Total lines = 78,336 (*.h *.c *.in)
+  Bacula code: Total files = 259 Total lines = 77,957 (*.h *.c *.in)
 
 Most Significant Changes since 1.32b
-- Implemented a RunAfterFailedJob record in the Job
-  resource.
+- Implemented a RunAfterFailedJob record in the Job resource.
 - Implemented "delete job" command in the Console.
-- Gnome 2.0 console compiles and works (but still has
-  certain scrolling problems). If your text window suddenly
-  goes blank, just left click on it and the text will
-  come back.
+- Gnome 2.0 console compiles and works. 
 - Implemented VerifyJob record in the Job resource
   that tells Verify which job to verify (JobId not required) 
 - First cut Verify Disk to Catalog
-- Fix "status dir" to examine all run commands in sched.
+- Fix "status dir" to examine all run commands in Schedule.
 - Close unused file descriptors in bpipe.c
 - There is now a patch for FreeBSD 4.8 pthreads that
   fixes the problems of data loss at the end of a tape.

diff --git a/bacula/kernstodo b/bacula/kernstodo
index cc6998a743aa21facb502be8c8f1c968462127a0..12d9065149af0aa88749dc1b896852bab0c9e267 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -25,22 +25,21 @@ Testing to do: (painful)
 
 For 1.33 Testing/Documentation:
 - bextract is sending everything to the log file ****FIXME****
-- Document to start higher priorty jobs before lower ones.
-- suppress "Do not forget to mount the drive!!!" if error
 - Document new records in Director. SDAddress SDDeviceName, SDPassword.
   FDPassword, FDAddress, DBAddress, DBPort, DBPassword.
 - Document new Include/Exclude ...
 - Add test of exclusion, test multiple Include {} statements.
 - Add counter variable test.
 - Document ln -sf /usr/lib/libncurses.so /usr/lib/libtermcap.so
-  and install the esound-dev  package for compiling Console on 
-  SuSE.
+  and install the esound-dev  package for compiling Console on SuSE.
 - Add an example of using a FIFO in dirdconf.wml 
 - Add an item to the FAQ about running jobs in different timezones.
                 
 For 1.32c
 
 For 1.33
+- Check and double check tree code, why does it take so long?
+- Upgrade to cygwin 1.5
 - Fix time difference problem between Bacula and Client
   so that everything is in GMT.
 - Finish implementation of Verify=DiskToCatalog
@@ -66,10 +65,8 @@ For 1.33
     By the way can bacula automatically "move" an empry/purged volume say 
     in the "short" pool to the "long" pool if this pool runs out of volume 
     space?
-- Implement a move Volume from one pool to another.
 - Either restrict the characters in a name, or fix the problem 
   emailing with names containing / (smtp command line breaks).
-- Eliminate ua_retention.c (retentioncmd) if possible.
 - Eliminate orphaned jobs: dbcheck, normal pruning, delete job command.
   Hm.  Well, there are the remaining orphaned job records:
 
@@ -121,8 +118,6 @@ For 1.33
 - Walk through the Pool records rather than the Job records
   in dird.c to create/update pools.
 - What to do about "list files job=xxx".
-- Implement delete Job.
-- Document need to put LabelFormat in quotes.
 - Implement scan: for every slot it finds, zero the slot of
   Volume other volume having that slot.
 - When job rescheduled, status gives is waiting for Client Rufus 
@@ -140,7 +135,6 @@ For 1.33
   rather than lowest MediaId.
 - Available volumes for autochangers (see patrick@baanboard.com 3 Sep 03 
   and 4 Sep) scan slots.
-- Upgrade to cygwin 1.5
 - Get MySQL 3.23.58
 - Get and test MySQL 4.0
 - Do a complete audit of all pthreads_mutex, cond, ... to ensure that
@@ -201,7 +195,6 @@ For 1.33
 - Make things like list where a file is saved case independent for
   Windows.
 - Edit the Client/Storage name into authentication failure messages.
-- Implement job in VerifyToCatalog
 - Implement migrate
 - Implement a PostgreSQL driver.
 - Bacula needs to propagate SD errors.
@@ -1068,4 +1061,12 @@ Done: (see kernsdone for more)
 - Document update volume pool and other command line keywords.
 - Add VerifyJob to "run" summary (yes/mod/no) prompt.
 - For listing, eliminate multiple JobIds in restore Jobs listing.
+- Document to start higher priorty jobs before lower ones.
+- suppress "Do not forget to mount the drive!!!" if error
+- Change error message when closing brace left off ...
+- Implement a move Volume from one pool to another.
+- Implement delete Job.
+- Document need to put LabelFormat in quotes.
+- Implement job in VerifyToCatalog
+- Eliminate ua_retention.c (retentioncmd) if possible.
 

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 299cf2c663b4423d7e34561068893eb45443ba9a..851d93d3365472ecd0a63d8ee4b20eb60d5aeddf 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -30,7 +30,7 @@ SVRSRCS = dird.c admin.c authenticate.c \
          recycle.c restore.c run_conf.c \
          scheduler.c sql_cmds.c \
          ua_cmds.c ua_dotcmds.c \
-         ua_query.c ua_retention.c \
+         ua_query.c \
          ua_input.c ua_label.c ua_output.c ua_prune.c \
          ua_purge.c ua_restore.c ua_run.c \
          ua_select.c ua_server.c \
@@ -43,7 +43,7 @@ SVROBJS = dird.o admin.o authenticate.o \
          recycle.o restore.o run_conf.o \
          scheduler.o sql_cmds.o \
          ua_cmds.o ua_dotcmds.o \
-         ua_query.o ua_retention.o \
+         ua_query.o \
          ua_input.o ua_label.o ua_output.o ua_prune.o \
          ua_purge.o ua_restore.o ua_run.o \
          ua_select.o ua_server.o \

diff --git a/bacula/src/dird/ua_label.c b/bacula/src/dird/ua_label.c
index 028c5e74b7314f2f7dd1a52aa26d6a931f5c99ad..33e9c5c3baf957f37539e41c7db81c5c087f4fa9 100644 (file)
--- a/bacula/src/dird/ua_label.c
+++ b/bacula/src/dird/ua_label.c
@@ -148,8 +148,8 @@ static int do_label(UAContext *ua, char *cmd, int relabel)
    char dev_name[MAX_NAME_LENGTH];
    MEDIA_DBR mr, omr;
    POOL_DBR pr;
+   bool print_reminder = true;
    int ok = FALSE;
-   int mounted = FALSE;
    int i;
    bool media_record_exists = false;
    static char *barcode_keyword[] = {
@@ -284,12 +284,17 @@ checkName:
            /* Here we can get
             *  3001 OK mount. Device=xxx      or
             *  3001 Mounted Volume vvvv
+            *  3906 is cannot mount non-tape
+            * So for those, no need to print a reminder
             */
-            mounted = strncmp(sd->msg, "3001 ", 5) == 0;
+            if (strncmp(sd->msg, "3001 ", 5) == 0 ||
+                strncmp(sd->msg, "3906 ", 5) == 0) {
+              print_reminder = false;
+           }
         }
       }
    }
-   if (!mounted) {
+   if (!print_reminder) {
       bsendmsg(ua, _("Do not forget to mount the drive!!!\n"));
    }
    bnet_sig(sd, BNET_TERMINATE);

diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c
index 2c68d7a2e1e0ee3eb967a342022557e225216c4c..5a390915c92ed92314e94c9879dab8dc704209dd 100755 (executable)
--- a/bacula/src/lib/parse_conf.c
+++ b/bacula/src/lib/parse_conf.c
@@ -678,7 +678,8 @@ parse_config(char *cf)
                     if (i >= 0) {
                         Dmsg2(150, "level=%d id=%s\n", level, lc->str);
                         Dmsg1(150, "Keyword = %s\n", lc->str);
-                        scan_err1(lc, "Keyword \"%s\" not permitted in this resource", lc->str);
+                        scan_err1(lc, "Keyword \"%s\" not permitted in this resource.\n"
+                           "Perhaps you left the trailing brace off of the previous resource.", lc->str);
                        /* NOT REACHED */
                     }
                     break;

diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c
index 143ee339bb2b9a55c1c1915ecd2050319342cb76..49bf8886711c45ab0160d945f155ab369d7eea07 100644 (file)
--- a/bacula/src/stored/dircmd.c
+++ b/bacula/src/stored/dircmd.c
@@ -324,10 +324,10 @@ static int do_label(JCR *jcr, int relabel)
            label_volume_if_ok(jcr, dev, oldname, newname, poolname, slot, relabel);
         } else if (dev->state & ST_READ || dev->num_writers) {
            if (dev->state & ST_READ) {
-                bnet_fsend(dir, _("3901 Device %s is busy with 1 reader.\n"),
+                bnet_fsend(dir, _("3911 Device %s is busy with 1 reader.\n"),
                   dev_name(dev));
            } else {
-                bnet_fsend(dir, _("3902 Device %s is busy with %d writer(s).\n"),
+                bnet_fsend(dir, _("3912 Device %s is busy with %d writer(s).\n"),
                   dev_name(dev), dev->num_writers);
            }
         } else {                     /* device not being used */
@@ -581,7 +581,7 @@ static int mount_cmd(JCR *jcr)
       }
    } else {
       pm_strcpy(&jcr->errmsg, dir->msg);
-      bnet_fsend(dir, _("3906 Error scanning mount command: %s\n"), jcr->errmsg);
+      bnet_fsend(dir, _("3909 Error scanning mount command: %s\n"), jcr->errmsg);
    }
    free_memory(dev_name);
    bnet_sig(dir, BNET_EOD);
@@ -823,7 +823,7 @@ static int autochanger_cmd(JCR *jcr)
       }
    } else {  /* error on scanf */
       pm_strcpy(&jcr->errmsg, dir->msg);
-      bnet_fsend(dir, _("3907 Error scanning autocharger list command: %s\n"),
+      bnet_fsend(dir, _("3908 Error scanning autocharger list command: %s\n"),
         jcr->errmsg);
    }
    free_memory(devname);