From f8acfd95fd86c54546355674637f06bf7e3bb581 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Mon, 27 Oct 2008 18:44:55 +0000 Subject: [PATCH] ebl Make this patch "official" git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7918 91ce42f0-d328-0410-95d8-f526ca767f89 --- .../{testing => }/2.4.3-update-slots.patch | 0 bacula/patches/testing/2.4.3-next-vol.patch | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+) rename bacula/patches/{testing => }/2.4.3-update-slots.patch (100%) diff --git a/bacula/patches/testing/2.4.3-update-slots.patch b/bacula/patches/2.4.3-update-slots.patch similarity index 100% rename from bacula/patches/testing/2.4.3-update-slots.patch rename to bacula/patches/2.4.3-update-slots.patch diff --git a/bacula/patches/testing/2.4.3-next-vol.patch b/bacula/patches/testing/2.4.3-next-vol.patch index cd3450064d..0d6e7033c0 100644 --- a/bacula/patches/testing/2.4.3-next-vol.patch +++ b/bacula/patches/testing/2.4.3-next-vol.patch @@ -187,3 +187,21 @@ Index: src/cats/sql_find.c } Dmsg1(050, "fnextvol=%s\n", mdb->cmd); if (!QUERY_DB(jcr, mdb, mdb->cmd)) { +Index: src/dird/autoprune.c +=================================================================== +--- src/dird/autoprune.c (revision 7854) ++++ 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