From 3c8b6623958662bd9988b3fff13e744d8ac329f9 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 21 Dec 2003 15:41:47 +0000 Subject: [PATCH] Minor updates after backporting to 1.32e git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@923 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/ReleaseNotes | 2 +- bacula/kernstodo | 1 + bacula/src/dird/ua_status.c | 2 +- bacula/src/stored/acquire.c | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index dd1d371864..f633048a07 100644 --- 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 faba0a8052..77fcf8f313 100644 --- 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 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 00a4f8ae37..819a2302b3 100644 --- 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 4aadbd93ec..59b335ea36 100644 --- 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)); -- 2.39.5