From bf377255eabf1566c80b3b815994ede030d76c29 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 11 Nov 2004 17:30:32 +0000 Subject: [PATCH] JobDefs Storage resource completely overrode anything specified in Job resource -- bug 159 -- fixed. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1684 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/kernstodo | 2 +- bacula/src/dird/backup.c | 2 ++ bacula/src/dird/dird.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bacula/kernstodo b/bacula/kernstodo index 8d348f2d00..429c4dcbc2 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -17,6 +17,7 @@ For 1.36.1: - Add date/time to each Jmsg. 1.37 Items: +- Implement a Pool of type Cleaning? - Implement VolReadTime and VolWriteTime in SD - Modify Backing up Your Database to include a bootstrap file. - Add restore of specific JobId to regression. @@ -980,4 +981,3 @@ Block Position: 0 === Done - Add "Rerun failed levels = yes/no" to Job resource. - diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index 71cd29a1dc..e14a156b0b 100644 --- a/bacula/src/dird/backup.c +++ b/bacula/src/dird/backup.c @@ -448,6 +448,7 @@ Backup Level: %s%s\n\ Client: %s\n\ FileSet: \"%s\" %s\n\ Pool: \"%s\"\n\ +Storage: \"%s\"\n\ Start time: %s\n\ End time: %s\n\ FD Files Written: %s\n\ @@ -472,6 +473,7 @@ Termination: %s\n\n"), jcr->client->hdr.name, jcr->fileset->hdr.name, fsr->cCreateTime, jcr->pool->hdr.name, + jcr->store->hdr.name, sdt, edt, edit_uint64_with_commas(jcr->jr.JobFiles, ec1), diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c index dda2443f7b..9f74f27d37 100644 --- a/bacula/src/dird/dird.c +++ b/bacula/src/dird/dird.c @@ -495,7 +495,7 @@ Without that I don't know who I am :-(\n"), configfile); /* Handle Storage alists specifically */ JOB *jobdefs = job->jobdefs; for (i=0; i < MAX_STORE; i++) { - if (jobdefs->storage[i]) { + if (jobdefs->storage[i] && !job->storage[i]) { STORE *st; job->storage[i] = New(alist(10, not_owned_by_alist)); foreach_alist(st, jobdefs->storage[i]) { -- 2.39.5