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

diff --git a/bacula/patches/testing/next_vol.patch b/bacula/patches/testing/next_vol.patch
index d7227000550b00e68b1e9e1404b3a9916d3b0cf9..2717a76094a70c00d952dd6eb87882c4b24b78db 100644 (file)
--- 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 <bacula-source>
+  patch -p0 <2.4.3-next-vol.patch
+  ./configure <your-options>
+  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);