From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 6 Nov 2008 18:53:55 +0000 (+0000)
Subject: ebl  First patch to fix #1182
X-Git-Tag: Release-7.0.0~3780
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=40856eeed203c41a312e4793ad5445121e79b509;p=bacula%2Fbacula

ebl  First patch to fix #1182


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

diff --git a/bacula/patches/testing/1182-recycle-flag.patch b/bacula/patches/testing/1182-recycle-flag.patch
new file mode 100644
index 0000000000..56e8faed55
--- /dev/null
+++ b/bacula/patches/testing/1182-recycle-flag.patch
@@ -0,0 +1,34 @@
+
+ This patch should fix the bug #1182 about Recycle flag
+ that is not updated after a pool change.
+ Should work for 2.4.3.
+
+ cd <bacula-source>
+ patch -p0 <1182-prune.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+Index: src/cats/sql_update.c
+===================================================================
+--- src/cats/sql_update.c	(révision 7981)
++++ src/cats/sql_update.c	(copie de travail)
+@@ -384,7 +384,7 @@
+         "Slot=%d,InChanger=%d,VolReadTime=%s,VolWriteTime=%s,VolParts=%d,"
+         "LabelType=%d,StorageId=%s,PoolId=%s,VolRetention=%s,VolUseDuration=%s,"
+         "MaxVolJobs=%d,MaxVolFiles=%d,Enabled=%d,LocationId=%s,"
+-        "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d"
++        "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d,Recycle=%d"
+         " WHERE VolumeName='%s'",
+         mr->VolJobs, mr->VolFiles, mr->VolBlocks, edit_uint64(mr->VolBytes, ed1),
+         mr->VolMounts, mr->VolErrors, mr->VolWrites,
+@@ -402,7 +402,7 @@
+         mr->Enabled, edit_uint64(mr->LocationId, ed9),
+         edit_uint64(mr->ScratchPoolId, ed10),
+         edit_uint64(mr->RecyclePoolId, ed11),
+-        mr->RecycleCount,
++        mr->RecycleCount,mr->Recycle,
+         mr->VolumeName);
+ 
+    Dmsg1(400, "%s\n", mdb->cmd);