From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 21 Oct 2008 08:23:42 +0000 (+0000)
Subject: ebl  Fix next_vol()
X-Git-Tag: Release-7.0.0~3897
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cea8b13d4f583992f7ac405e42fc0d23d732b0b8;p=bacula%2Fbacula

ebl  Fix next_vol()


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

diff --git a/bacula/patches/testing/next_vol.patch b/bacula/patches/testing/next_vol.patch
index 2da17f6535..d722700055 100644
--- a/bacula/patches/testing/next_vol.patch
+++ b/bacula/patches/testing/next_vol.patch
@@ -54,25 +54,3 @@ Index: src/dird/next_vol.c
           }
  
  
-Index: src/dird/autoprune.c
-===================================================================
---- src/dird/autoprune.c	(revision 7259)
-+++ src/dird/autoprune.c	(working copy)
-@@ -176,6 +176,17 @@
-             prune_list.num_ids = 0;             /* reset count */
-          }
-          ok = is_volume_purged(ua, &lmr);
-+
-+	 /* 
-+	  * Check if this volume is available (InChanger + StorageId) 
-+	  * If not, just skip this volume and try the next one
-+	  */
-+	 if (ok && InChanger) {
-+	    if (!lmr.InChanger || (lmr.StorageId != mr->StorageId)) {
-+	       ok = false;		/* skip this volume, ie not loadable */
-+	    }
-+	 }
-+
-          /*
-           * If purged and not moved to another Pool, 
-           *   then we stop pruning and take this volume.