Some small fixes to the counting and some small relayout of small code sniplets.

[bacula/bacula] / bacula / src / dird / autoprune.c

diff --git a/bacula/src/dird/autoprune.c b/bacula/src/dird/autoprune.c
index 91092407627bc542259cfd537cd6344207deb582..31f09167acbfba70000e6cfd33d1ac6b4d90646d 100644 (file)
--- a/bacula/src/dird/autoprune.c
+++ b/bacula/src/dird/autoprune.c
@@ -122,7 +122,14 @@ void prune_volumes(JCR *jcr, bool InChanger, MEDIA_DBR *mr)
    } else {
       ed2[0] = 0;
    }
-   Dmsg1(100, "Scratch pool=%s\n", ed2);
+
+   if(mr->ScratchPoolId) {
+      edit_int64(mr->ScratchPoolId, ed3);
+      bstrncat(ed2, ed3, sizeof(ed2));
+      bstrncat(ed2, ",", sizeof(ed2));
+   }
+
+   Dmsg1(100, "Scratch pool(s)=%s\n", ed2);
    /*
     * ed2 ends up with scratch poolid and current poolid or
     *   just current poolid if there is no scratch pool 
@@ -182,9 +189,10 @@ void prune_volumes(JCR *jcr, bool InChanger, MEDIA_DBR *mr)
             prune_list.num_ids = 0;             /* reset count */
          }
          if (!is_volume_purged(ua, &lmr)) {
-            Dmsg1(100, "Vol=%s not pruned\n", lmr.VolumeName);
+            Dmsg1(050, "Vol=%s not pruned\n", lmr.VolumeName);
             continue;
          }
+         Dmsg1(050, "Vol=%s is purged\n", lmr.VolumeName);
 
          /*
           * Since we are also pruning the Scratch pool, continue