From 7eed7022f23db5875f6aca214d3cc5ae50d35e70 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Mon, 27 Oct 2008 18:28:39 +0000 Subject: [PATCH] ebl Don't need to get a scratch volume in prune_volume() function git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7914 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/patches/testing/next_vol.patch | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/bacula/patches/testing/next_vol.patch b/bacula/patches/testing/next_vol.patch index d722700055..2717a76094 100644 --- a/bacula/patches/testing/next_vol.patch +++ b/bacula/patches/testing/next_vol.patch @@ -1,3 +1,15 @@ + + This patch fix #1173 about problems during volume selection. + + It can be applied to 2.4.3 (not to previous versions) with: + + cd + patch -p0 <2.4.3-next-vol.patch + ./configure + make + ... + make install + Index: src/dird/next_vol.c =================================================================== --- src/dird/next_vol.c (revision 7259) @@ -54,3 +66,21 @@ Index: src/dird/next_vol.c } +Index: src/dird/autoprune.c +=================================================================== +--- src/dird/autoprune.c (revision 7895) ++++ src/dird/autoprune.c (working copy) +@@ -204,13 +204,6 @@ + memcpy(mr, &lmr, sizeof(lmr)); + break; /* got a volume */ + } +- /* +- * We purged something but did not get a volume in the current pool. +- * It must be a scratch volume, so try to get it. +- */ +- if (ok && get_scratch_volume(jcr, InChanger, mr)) { +- break; /* got a volume */ +- } + ok = false; /* clear OK, in case we fall out */ + } else { + Dmsg2(050, "Nothing pruned MediaId=%d Volume=%s\n", (int)lmr.MediaId, lmr.VolumeName); -- 2.39.5