Minor updates after backporting to 1.32e

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

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index dd1d3718646bb32d02eebe7757f989403142a5f5..f633048a07f13142b93a3f3b34b4cde9b6df388d 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,7 +1,7 @@
 
           Release Notes for Bacula 1.33
 
-  Bacula code: Total files = 261 Total lines = 80,969 (*.h *.c *.in)
+  Bacula code: Total files = 271 Total lines = 82,422 (*.h *.c *.in)
 
 Most Significant Changes since 1.32d
 - Implement "update slots scan" that reads the volume label(s).

diff --git a/bacula/kernstodo b/bacula/kernstodo
index faba0a8052c9cd4c6d391bcb4be641281245f8b4..77fcf8f313161f77eaf5360ef6e60fcfc04bf43a 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -56,6 +56,7 @@ For 1.33 Testing/Documentation:
                 
 For 1.33
 - Look at Dan's field width problems in PostgreSQL.
+- Look at effect of removing GROUP BYs.
 - In restore take all filesets with same base name.
 - From Alan Brown <ajb2@mssl.ucl.ac.uk>
     BTW, there's a make install bug in 1.33 - with --enable-gnome,

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 00a4f8ae37d30ed1bc67528518471aea9f69ac3d..819a2302b34495086af1e380fd9ee8e7c6de6644 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -531,7 +531,7 @@ static void list_terminated_jobs(UAContext *ua)
    char dt[MAX_TIME_LENGTH], b1[30], b2[30];
    char level[10];
 
-   if (last_jobs->size() == 0) {
+   if (last_jobs->empty()) {
       bsendmsg(ua, _("No Terminated Jobs.\n"));
       return;
    }

diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index 4aadbd93ec55037775f9041286c0f01aab09d9be..59b335ea360d8cf457c7d1d926a7b06c7ea9f7c7 100644 (file)
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -155,8 +155,8 @@ default_path:
       goto get_out;
    }
 
-   dev->state &= ~ST_APPEND;
-   dev->state |= ST_READ;
+   dev->state &= ~ST_APPEND;         /* clear any previous append mode */
+   dev->state |= ST_READ;            /* set reed mode */
    attach_jcr_to_device(dev, jcr);    /* attach jcr to device */
    Jmsg(jcr, M_INFO, 0, _("Ready to read from volume \"%s\" on device %s.\n"),
       jcr->VolumeName, dev_name(dev));